fixed some PME normals
This commit is contained in:
parent
8c8a0944cb
commit
5b8f4c0eae
8 changed files with 14 additions and 7 deletions
|
@ -221,7 +221,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
|
|||
}
|
||||
|
||||
@Override
|
||||
protected Object clone() throws CloneNotSupportedException {
|
||||
public Object clone() throws CloneNotSupportedException {
|
||||
return UserInfo.of(this);
|
||||
}
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ import java.io.IOException;
|
|||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import org.eclipse.rap.fileupload.FileDetails;
|
||||
|
@ -138,7 +139,8 @@ public class FileUploadSelection extends Composite {
|
|||
private boolean fileSupported(final String fileName) {
|
||||
return this.supportedFileExtensions
|
||||
.stream()
|
||||
.filter(fileType -> fileName.toUpperCase().endsWith(fileType.toUpperCase()))
|
||||
.filter(fileType -> fileName.toUpperCase(Locale.ROOT)
|
||||
.endsWith(fileType.toUpperCase(Locale.ROOT)))
|
||||
.findFirst()
|
||||
.isPresent();
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@ import java.util.Arrays;
|
|||
import java.util.Base64;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
|
@ -189,7 +190,8 @@ public final class ImageUploadSelection extends Composite {
|
|||
private static boolean fileSupported(final String fileName) {
|
||||
return SUPPORTED_IMAGE_FILES
|
||||
.stream()
|
||||
.filter(fileType -> fileName.toUpperCase().endsWith(fileType.toUpperCase()))
|
||||
.filter(fileType -> fileName.toUpperCase(Locale.ROOT)
|
||||
.endsWith(fileType.toUpperCase(Locale.ROOT)))
|
||||
.findFirst()
|
||||
.isPresent();
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@ import org.eclipse.swt.widgets.Shell;
|
|||
|
||||
public final class Message extends MessageBox {
|
||||
|
||||
private static final int NORMAL_WIDTH = 400;
|
||||
private static final long serialVersionUID = 6973272221493264432L;
|
||||
|
||||
public Message(final Shell parent, final String title, final String message, final int type) {
|
||||
|
@ -32,9 +33,9 @@ public final class Message extends MessageBox {
|
|||
layout.marginBottom = 10;
|
||||
super.shell.setData(RWT.CUSTOM_VARIANT, "message");
|
||||
final Rectangle bounds = super.shell.getBounds();
|
||||
if (bounds.width < 400) {
|
||||
bounds.x = bounds.x - (400 - bounds.width) / 2;
|
||||
bounds.width = 400;
|
||||
if (bounds.width < NORMAL_WIDTH) {
|
||||
bounds.x = bounds.x - (NORMAL_WIDTH - bounds.width) / 2;
|
||||
bounds.width = NORMAL_WIDTH;
|
||||
super.shell.setBounds(bounds);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -282,6 +282,7 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO {
|
|||
break;
|
||||
default:
|
||||
selectionFunction = key -> Result.of(Collections.emptyList()); //empty select function
|
||||
break;
|
||||
}
|
||||
|
||||
return getDependencies(bulkAction, selectionFunction);
|
||||
|
|
|
@ -302,6 +302,7 @@ public class ExamDAOImpl implements ExamDAO {
|
|||
break;
|
||||
default:
|
||||
selectionFunction = key -> Result.of(Collections.emptyList()); //empty select function
|
||||
break;
|
||||
}
|
||||
|
||||
return getDependencies(bulkAction, selectionFunction);
|
||||
|
|
|
@ -245,6 +245,7 @@ public class IndicatorDAOImpl implements IndicatorDAO {
|
|||
break;
|
||||
default:
|
||||
selectionFunction = key -> Result.of(Collections.emptyList()); //empty select function
|
||||
break;
|
||||
}
|
||||
|
||||
return getDependencies(bulkAction, selectionFunction);
|
||||
|
|
|
@ -187,7 +187,6 @@ public class UserDAOImpl implements UserDAO {
|
|||
.flatMap(DAOLoggingSupport::logAndSkipOnError)
|
||||
.filter(_predicate)
|
||||
.collect(Collectors.toList());
|
||||
;
|
||||
|
||||
return userInfo;
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue