Author: mmichaud
Date: 2009-04-17 05:54:38 -0700 (Fri, 17 Apr 2009)
New Revision: 16609
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedDoubleHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedFloatHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedIntegerHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedLongHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/InputStreamHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
Log:
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -52,7 +52,7 @@
}
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = "+ myBoolean + "#########");
+// System.out.println("#########Value will be reset to initial
value = "+ myBoolean + "#########");
try{
f.set(o,myBoolean);
}catch(Exception e){e.printStackTrace();}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedDoubleHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedDoubleHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedDoubleHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -62,7 +62,7 @@
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = " + initValue + "#########");
+// System.out.println("#########Value will be reset to initial
value = " + initValue + "#########");
myBounded.setValue(initValue);
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedFloatHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedFloatHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedFloatHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -63,7 +63,7 @@
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = "+ initValue + "#########");
+// System.out.println("#########Value will be reset to initial
value = "+ initValue + "#########");
myBounded.setValue(initValue);
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedIntegerHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedIntegerHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedIntegerHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -62,7 +62,7 @@
}
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = "+initValue + "#########");
+// System.out.println("#########Value will be reset to initial
value = "+initValue + "#########");
myBounded.setValue(initValue);
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedLongHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedLongHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/BoundedLongHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -64,7 +64,7 @@
}
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = "+initValue + "#########");
+// System.out.println("#########Value will be reset to initial
value = "+initValue + "#########");
myBounded.setValue(initValue);
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -63,7 +63,7 @@
}
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = "+initValue + "#########");
+// System.out.println("#########Value will be reset to initial
value = "+initValue + "#########");
try {
f.set(o,initValue);
} catch (Exception e) { e.printStackTrace();}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -84,34 +84,34 @@
GroupLayout layout = new GroupLayout(panel);
panel.setLayout(layout);
-
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .addContainerGap()
-
.add(layout.createParallelGroup(GroupLayout.LEADING)
-
.add(titleLabel,GroupLayout.PREFERRED_SIZE,350,GroupLayout.PREFERRED_SIZE)
-
.add(titleSeparator,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
- )
- .addContainerGap()
-
.add(layout.createSequentialGroup()
-
.add(networkFileTextField,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
-
.addPreferredGap(LayoutStyle.RELATED)
-
.add(chooseButton))
- .addContainerGap()));
+//
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.LEADING)
+// .add(layout.createSequentialGroup()
+// .addContainerGap()
+//
.add(layout.createParallelGroup(GroupLayout.LEADING)
+//
.add(titleLabel,GroupLayout.PREFERRED_SIZE,350,GroupLayout.PREFERRED_SIZE)
+//
.add(titleSeparator,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
+// )
+// .addContainerGap()
+//
.add(layout.createSequentialGroup()
+//
.add(networkFileTextField,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
+//
.addPreferredGap(LayoutStyle.RELATED)
+//
.add(chooseButton))
+// .addContainerGap()));
+//
+//
layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.LEADING)
+// .add(layout.createSequentialGroup()
+// .addContainerGap()
+// .add(titleLabel)
+// .add(8, 8, 8)
+//
.add(titleSeparator,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
+// .add(7, 7, 7)
+//
.addPreferredGap(LayoutStyle.RELATED)
+//
.add(networkFileTextField,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
+//
.addPreferredGap(LayoutStyle.RELATED,3, Short.MAX_VALUE)
+// .add(chooseButton)
+// .addContainerGap()));
-
layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .addContainerGap()
- .add(titleLabel)
- .add(8, 8, 8)
-
.add(titleSeparator,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
- .add(7, 7, 7)
-
.addPreferredGap(LayoutStyle.RELATED)
-
.add(networkFileTextField,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
-
.addPreferredGap(LayoutStyle.RELATED,3, Short.MAX_VALUE)
- .add(chooseButton)
- .addContainerGap()));
-
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.LEADING)
.add(layout.createSequentialGroup()
.addContainerGap()
@@ -151,7 +151,7 @@
public void resetValue() {
try{
f.set(o, new File(""));
- System.out.println("#########Value will be reset to
initial value = "+ ((File) f.get(o)).getAbsolutePath()+ "#########");
+ //System.out.println("#########Value will be reset to
initial value = "+ ((File) f.get(o)).getAbsolutePath()+ "#########");
}catch(Exception e){e.printStackTrace();}
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -63,7 +63,7 @@
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = " + myFloat.floatValue() + "#########");
+// System.out.println("#########Value will be reset to initial
value = " + myFloat.floatValue() + "#########");
try{
f.set(o,myFloat);
}catch(Exception e){e.printStackTrace();}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/InputStreamHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/InputStreamHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/InputStreamHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -100,11 +100,11 @@
try{
if(localRadioButton.isSelected()){
f.set(o, new FileInputStream(""));
- System.out.println("#########Value will be
reset to initial value = "+ ((FileInputStream) f.get(o)).toString()+
"#########");
+// System.out.println("#########Value will be
reset to initial value = "+ ((FileInputStream) f.get(o)).toString()+
"#########");
}
else if(remoteRadioButton.isSelected()){
f.set(o, new URL(""));
- System.out.println("#########Value will be
reset to initial value = "+ ((URL) f.get(o)).getPath()+ "#########");
+// System.out.println("#########Value will be
reset to initial value = "+ ((URL) f.get(o)).getPath()+ "#########");
}
}catch(Exception e){e.printStackTrace();}
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -67,7 +67,6 @@
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = "+ myInteger.intValue() + "#########");
try{
f.set(o,myInteger);
}catch(Exception e){e.printStackTrace();}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -16,6 +16,7 @@
public class ListMultipleHandler<T> extends AbstractGuiHandler{
ListMultipleSelection<T> lms;
+ ListMultipleSelection<T> initialLms;
JList jlist;
private List<T> selected;
CheckListManager<T> checkListManager;
@@ -27,6 +28,7 @@
super(f,o,t);
try {
lms = (ListMultipleSelection<T>) f.get(o);
+ initialLms = (ListMultipleSelection<T>) f.get(o);
} catch(Exception e) {e.printStackTrace();}
panel = new JPanel(new BorderLayout());
JTextArea jta = new JTextArea(t.description());
@@ -58,11 +60,10 @@
public void resetValue() {
- lms.setSelectedValues(null);
try{
- f.set(o,lms);
+ f.set(o,initialLms);
}catch(Exception e){e.printStackTrace();}
- System.out.println("#########Value will be reset to initial
value = " + lms.getSelectedValues() + "#########");
+// System.out.println("#########Value will be reset to initial
value = " + initialLms.getSelectedValues() + "#########");
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -13,6 +13,7 @@
public class ListSingleHandler<T> extends AbstractGuiHandler {
ListSingleSelection<T> lss;
+ ListSingleSelection<T> initialLss;
JComboBox combobox;
T selected;
@@ -21,6 +22,7 @@
super(f,o,t);
try {
lss = (ListSingleSelection<T>) f.get(o);
+ initialLss = (ListSingleSelection<T>) f.get(o);
} catch(Exception e) {e.printStackTrace();}
panel = new JPanel(new BorderLayout());
@@ -50,11 +52,10 @@
public void resetValue() {
- lss.setSelectedValue(null);
try{
- f.set(o,lss);
+ f.set(o,initialLss);
}catch(Exception e){e.printStackTrace();}
- System.out.println("#########Value will be reset to initial
value = " + lss.getSelectedValue() + "#########");
+ //System.out.println("#########Value will be reset to initial
value = " + initialLss.getSelectedValue() + "#########");
}
public String getState() {
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -62,7 +62,7 @@
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = " + myLong.longValue() + "#########");
+// System.out.println("#########Value will be reset to initial
value = " + myLong.longValue() + "#########");
try{
f.set(o,myLong);
}catch(Exception e){e.printStackTrace();}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -48,7 +48,7 @@
public void resetValue(){
- System.out.println("#########Value will be reset to initial
value = " + myString + "#########");
+// System.out.println("#########Value will be reset to initial
value = " + myString + "#########");
try{
f.set(o,myString);
}catch(Exception e){e.printStackTrace();}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
2009-04-17 12:11:47 UTC (rev 16608)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
2009-04-17 12:54:38 UTC (rev 16609)
@@ -112,7 +112,7 @@
public void resetValue(){
try{
f.set(o, new URL(""));
- System.out.println("#########Value will be reset to
initial value = "+ ((URL) f.get(o)).getPath()+ "#########");
+// System.out.println("#########Value will be reset to
initial value = "+ ((URL) f.get(o)).getPath()+ "#########");
}catch(Exception e){e.printStackTrace();}
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---
