git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3058 refactored raising JColorChooser for JS compatibility
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
1400fcf
..
305d592
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-2455,6
+2455,7
@@
public class Desktop extends jalview.jbgui.GDesktop
@Override
public void propertyChange(PropertyChangeEvent event)
{
@Override
public void propertyChange(PropertyChangeEvent event)
{
+ // TODO this is obsolete with JAL-3048 - delete?
Object val = event.getNewValue();
String name = event.getPropertyName();
System.out.println(name);
Object val = event.getNewValue();
String name = event.getPropertyName();
System.out.println(name);
@@
-2478,14
+2479,6
@@
public class Desktop extends jalview.jbgui.GDesktop
return;
}
break;
return;
}
break;
- case "javax.swing.ColorChooserDialog":
- switch (name)
- {
- case "SelectedColor":
- onDialogReturn(val);
- return;
- }
- break;
case "javax.swing.JFileChooser":
switch (name)
{
case "javax.swing.JFileChooser":
switch (name)
{
@@
-2511,9
+2504,7
@@
public class Desktop extends jalview.jbgui.GDesktop
dialogData[0] = value;
((Runnable) dialogData[1]).run();
break;
dialogData[0] = value;
((Runnable) dialogData[1]).run();
break;
- case "label.select_feature_colour":
- ((FeatureRenderer) dialogData[1]).processColorDialog((Color) value);
- break;
+ default:
}
}
}
}