Skip to content

Commit a163c2a

Browse files
authored
GH-431 clean up viewer component dialogs (#433)
1 parent 34b48c4 commit a163c2a

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/DocumentViewControllerImpl.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.icepdf.ri.common.views.annotations.AbstractAnnotationComponent;
2828
import org.icepdf.ri.common.views.annotations.AnnotationState;
2929
import org.icepdf.ri.common.views.annotations.PopupAnnotationComponent;
30+
import org.icepdf.ri.common.views.annotations.signing.BasicSignatureAppearanceCallback;
3031
import org.icepdf.ri.common.views.destinations.DestinationComponent;
3132
import org.icepdf.ri.images.Images;
3233

@@ -361,7 +362,12 @@ public AnnotationCallback getAnnotationCallback() {
361362
* @return assigned callback
362363
*/
363364
public SignatureAppearanceCallback getSignatureAppearanceCallback() {
364-
return signatureAppearanceCallback;
365+
if (signatureAppearanceCallback != null) {
366+
return signatureAppearanceCallback;
367+
} else {
368+
// component will use the default implementation
369+
return new BasicSignatureAppearanceCallback();
370+
}
365371
}
366372

367373
/**

viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/annotations/summary/AnnotationSummaryFrame.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ public void refreshDocumentInstance() {
4646
if (document.getInfo() != null) {
4747
title = document.getInfo().getTitle();
4848
}
49-
Object[] messageArguments = {title != null ? title : controller.getViewerFrame().getTitle()};
49+
Object[] messageArguments = {title != null ? title : controller.getViewerFrame() != null ?
50+
controller.getViewerFrame().getTitle() : ""};
5051
MessageFormat formatter = new MessageFormat(
5152
messageBundle.getString("viewer.window.annotationSummary.title.open.default"));
5253
setTitle(formatter.format(messageArguments));

viewer/viewer-awt/src/main/java/org/icepdf/ri/common/widgets/RgbColorChooser.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,6 @@ public class RgbColorChooser {
5252
public static Color showDialog(Component component, String title, Color initialColor)
5353
throws HeadlessException {
5454

55-
try {
56-
String defaultLF = UIManager.getSystemLookAndFeelClassName();
57-
if (defaultLF.contains("GTK")) {
58-
UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
59-
}
60-
} catch (Exception e) {
61-
logger.warning("Could not set metal look and feel.");
62-
}
63-
6455
JColorChooser colorChooser = new JColorChooser(initialColor != null ?
6556
initialColor : Color.white);
6657
AbstractColorChooserPanel[] panels = colorChooser.getChooserPanels();
@@ -83,6 +74,7 @@ public static Color showDialog(Component component, String title, Color initialC
8374
title,
8475
true, colorChooser, colorTracker, cancelActionListener);
8576

77+
colorChooserDialog.setLocationByPlatform(true);
8678
colorChooserDialog.setVisible(true);
8779

8880
try {

0 commit comments

Comments
 (0)