Author: mmichaud
Date: 2009-04-17 10:03:17 -0700 (Fri, 17 Apr 2009)
New Revision: 16614
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/GuiHandlerFactory.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
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 17:02:52 UTC (rev 16613)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
2009-04-17 17:03:17 UTC (rev 16614)
@@ -14,6 +14,7 @@
import org.jdesktop.layout.LayoutStyle;
import cytoscape.Cytoscape;
+import org.cytoscape.io.util.FileUtil;
@@ -29,11 +30,11 @@
private JSeparator titleSeparator;
// private InputStream is = null;
private MouseClic mc;
- //FileUtil flUtil;
+// FileUtil flUtil;
protected FileHandler(Field f, Object o, Tunable t) {
super(f,o,t);
- //this.flUtil = flUtil;
+// this.flUtil = flUtil;
fileChooser = new JFileChooser();
for(Param s :t.flag())if(s.equals(Param.network)){
@@ -84,32 +85,6 @@
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.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)
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
2009-04-17 17:02:52 UTC (rev 16613)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
2009-04-17 17:03:17 UTC (rev 16614)
@@ -7,6 +7,8 @@
import java.io.File;
import java.io.InputStream;
+import org.cytoscape.io.util.FileUtil;
+import org.cytoscape.io.util.StreamUtil;
import org.cytoscape.property.bookmark.Bookmarks;
import org.cytoscape.property.bookmark.BookmarksUtil;
import org.cytoscape.property.CyProperty;
@@ -25,13 +27,13 @@
private Bookmarks bookmarks;
private BookmarksUtil bkUtil;
-// private FileUtil flUtil;
-// private StreamUtil stUtil;
+// public FileUtil flUtil;
+// public StreamUtil stUtil;
public GuiHandlerFactory(CyProperty<Bookmarks> book, BookmarksUtil
bkUtil) {
this.bookmarks = book.getProperties();
this.bkUtil = bkUtil;
-// this.flUtil = flUtil;
+//this.flUtil = flUtil;
// this.stUtil = stUtil;
}
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 17:02:52 UTC (rev 16613)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
2009-04-17 17:03:17 UTC (rev 16614)
@@ -27,7 +27,6 @@
try{
this.myInteger=(Integer)f.get(o);
}catch(Exception e){e.printStackTrace();}
-
panel = new JPanel(new BorderLayout());
for(Param par :
t.alignment())if(par==Param.horizontal)horizontal=true;
JLabel label = new JLabel(t.description());
@@ -35,8 +34,8 @@
try {
jtf = new JTextField(f.get(o).toString(), 10);
- //jtf.addActionListener( this );
} catch (Exception e) { e.printStackTrace(); }
+// jtf.addActionListener(this);
jtf.setHorizontalAlignment(JTextField.RIGHT);
if(horizontal==false){
panel.add(label,BorderLayout.WEST);
Modified:
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-04-17 17:02:52 UTC (rev 16613)
+++
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-04-17 17:03:17 UTC (rev 16614)
@@ -26,7 +26,7 @@
<osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
filter="(cyPropertyName=bookmarks)" />
<osgi:reference id="bookmarksUtilServiceRef"
interface="org.cytoscape.property.bookmark.BookmarksUtil" />
-<!-- <osgi:reference id="fileUtilServiceRef"
interface="cytoscape.util.FileUtil"/>
-<osgi:reference id="streamUtilServiceRef"
interface="org.cytoscape.io.util.StreamUtil"/> -->
+<!-- <osgi:reference id="fileUtilServiceRef"
interface="org.cytoscape.io.util.FileUtil"/>-->
+<!-- <osgi:reference id="streamUtilServiceRef"
interface="org.cytoscape.io.util.StreamUtil"/> -->
</beans>
Modified:
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-04-17 17:02:52 UTC (rev 16613)
+++
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-04-17 17:03:17 UTC (rev 16614)
@@ -26,8 +26,8 @@
<bean id="guiHandlerFactory"
class="org.cytoscape.work.internal.tunables.GuiHandlerFactory">
<constructor-arg ref="bookmarkServiceRef" />
<constructor-arg ref="bookmarksUtilServiceRef" />
-<!-- <constructor-arg ref="fileUtilServiceRef"/>
- <constructor-arg ref="streamUtilServiceRef"/> -->
+<!-- <constructor-arg ref="fileUtilServiceRef"/>-->
+<!-- <constructor-arg ref="streamUtilServiceRef"/>-->
</bean>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
