Author: kono
Date: 2009-06-26 15:50:48 -0700 (Fri, 26 Jun 2009)
New Revision: 17126
Added:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/CreateMultilayerNetworkTask.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/CreateMultilayerNetworkTaskFactoryImpl.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/LoadMultilayerNetworksTask.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/LoadMultilayerNetworksTaskFactoryImpl.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LoadMultilayerNetworkTaskPanel.java
Removed:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/ExampleService.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/creation/
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ExampleActivator.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ExampleServiceImpl.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/AbstractLoadMultilayerNetworksTask.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTask.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTaskFactoryImpl.java
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Package structure changed.
Deleted:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/ExampleService.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/ExampleService.java
2009-06-26 22:32:23 UTC (rev 17125)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/ExampleService.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -1,12 +0,0 @@
-package org.cytoscape.layer;
-
-/**
- * Public API representing an example OSGi service
- */
-public interface ExampleService
-{
- // public methods go here...
-
- String scramble( String text );
-}
-
Deleted:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ExampleActivator.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ExampleActivator.java
2009-06-26 22:32:23 UTC (rev 17125)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ExampleActivator.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -1,45 +0,0 @@
-package org.cytoscape.layer.internal;
-
-import java.util.Dictionary;
-import java.util.Properties;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-import org.cytoscape.layer.ExampleService;
-
-/**
- * Extension of the default OSGi bundle activator
- */
-public final class ExampleActivator
- implements BundleActivator
-{
- /**
- * Called whenever the OSGi framework starts our bundle
- */
- public void start( BundleContext bc )
- throws Exception
- {
- System.out.println( "STARTING org.cytoscape.layer" );
-
- Dictionary props = new Properties();
- // add specific service properties here...
-
- System.out.println( "REGISTER org.cytoscape.layer.ExampleService" );
-
- // Register our example service implementation in the OSGi service
registry
- bc.registerService( ExampleService.class.getName(), new
ExampleServiceImpl(), props );
- }
-
- /**
- * Called whenever the OSGi framework stops our bundle
- */
- public void stop( BundleContext bc )
- throws Exception
- {
- System.out.println( "STOPPING org.cytoscape.layer" );
-
- // no need to unregister our service - the OSGi framework handles it
for us
- }
-}
-
Deleted:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ExampleServiceImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ExampleServiceImpl.java
2009-06-26 22:32:23 UTC (rev 17125)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ExampleServiceImpl.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -1,38 +0,0 @@
-package org.cytoscape.layer.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.cytoscape.layer.ExampleService;
-
-/**
- * Internal implementation of our example OSGi service
- */
-public final class ExampleServiceImpl
- implements ExampleService
-{
- // implementation methods go here...
-
- public String scramble( String text )
- {
- List charList = new ArrayList();
-
- char[] textChars = text.toCharArray();
- for( int i = 0; i < textChars.length; i++ )
- {
- charList.add( new Character( textChars[i] ) );
- }
-
- Collections.shuffle( charList );
-
- char[] mixedChars = new char[text.length()];
- for( int i = 0; i < mixedChars.length; i++ )
- {
- mixedChars[i] = ( (Character) charList.get( i ) ).charValue();
- }
-
- return new String( mixedChars );
- }
-}
-
Copied:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/CreateMultilayerNetworkTask.java
(from rev 17122,
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/creation/CreateMultilayerNetworkTask.java)
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/CreateMultilayerNetworkTask.java
(rev 0)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/CreateMultilayerNetworkTask.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -0,0 +1,30 @@
+package org.cytoscape.layer.internal.tasks;
+
+import org.cytoscape.work.Task;
+import org.cytoscape.work.TaskMonitor;
+
+import cytoscape.CyNetworkManager;
+
+public class CreateMultilayerNetworkTask implements Task {
+ private CyNetworkManager manager;
+ private TaskMonitor taskMonitor;
+
+ // private LayerFactory lFactory;
+
+ public CreateMultilayerNetworkTask(CyNetworkManager manager) {
+ this.manager = manager;
+ }
+
+ public void cancel() {
+
+ }
+
+ public void run(TaskMonitor taskMonitor) throws Exception {
+ this.taskMonitor = taskMonitor;
+ taskMonitor.setProgress(-1.0);
+ taskMonitor.setStatusMessage("Creating Multi Layer Network...");
+
+ // lFactory.addLayer()
+ }
+
+}
Copied:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/CreateMultilayerNetworkTaskFactoryImpl.java
(from rev 17122,
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/creation/CreateMultilayerNetworkTaskFactoryImpl.java)
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/CreateMultilayerNetworkTaskFactoryImpl.java
(rev 0)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/CreateMultilayerNetworkTaskFactoryImpl.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -0,0 +1,5 @@
+package org.cytoscape.layer.internal.tasks;
+
+public class CreateMultilayerNetworkTaskFactoryImpl {
+
+}
Copied:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/LoadMultilayerNetworksTask.java
(from rev 17122,
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTask.java)
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/LoadMultilayerNetworksTask.java
(rev 0)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/LoadMultilayerNetworksTask.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -0,0 +1,46 @@
+package org.cytoscape.layer.internal.tasks;
+
+import static org.cytoscape.io.DataCategory.NETWORK;
+
+import java.io.File;
+import java.util.Properties;
+
+import javax.swing.JDialog;
+
+import org.cytoscape.io.read.CyReaderManager;
+import org.cytoscape.layer.internal.ui.LoadMultilayerNetworkTaskPanel;
+import org.cytoscape.layout.CyLayouts;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.work.Task;
+import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
+
+import cytoscape.CyNetworkManager;
+import cytoscape.util.CyNetworkNaming;
+
+public class LoadMultilayerNetworksTask implements Task {
+
+ // This should be injected.
+ private CyNetworkManager manager;
+
+ public LoadMultilayerNetworksTask(CyNetworkManager manager) {
+ this.manager = manager;
+ }
+
+ /**
+ * Executes Task.
+ */
+ public void run(TaskMonitor taskMonitor) throws Exception {
+ LoadMultilayerNetworkTaskPanel panel = new
LoadMultilayerNetworkTaskPanel();
+
+ JDialog dialog = new JDialog();
+ dialog.setTitle("Multilayer Network Builder");
+ dialog.setVisible(true);
+ }
+
+ public void cancel() {
+ // TODO Auto-generated method stub
+
+ }
+}
Copied:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/LoadMultilayerNetworksTaskFactoryImpl.java
(from rev 17122,
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTaskFactoryImpl.java)
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/LoadMultilayerNetworksTaskFactoryImpl.java
(rev 0)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/LoadMultilayerNetworksTaskFactoryImpl.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -0,0 +1,19 @@
+package org.cytoscape.layer.internal.tasks;
+
+import org.cytoscape.work.Task;
+import org.cytoscape.work.TaskFactory;
+
+import cytoscape.CyNetworkManager;
+
+public class LoadMultilayerNetworksTaskFactoryImpl implements TaskFactory {
+
+ private CyNetworkManager netmgr;
+
+ public LoadMultilayerNetworksTaskFactoryImpl(CyNetworkManager netmgr) {
+ this.netmgr = netmgr;
+ }
+
+ public Task getTask() {
+ return new LoadMultilayerNetworksTask(netmgr);
+ }
+}
Copied:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LoadMultilayerNetworkTaskPanel.java
(from rev 17124,
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/panel/LoadMultilayerNetworkTaskPanel.java)
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LoadMultilayerNetworkTaskPanel.java
(rev 0)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LoadMultilayerNetworkTaskPanel.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -0,0 +1,328 @@
+package org.cytoscape.layer.internal.ui;
+
+import javax.swing.JPanel;
+
+import org.jdesktop.layout.GroupLayout;
+import org.jdesktop.layout.LayoutStyle;
+
+import static org.jdesktop.layout.GroupLayout.*;
+import static org.jdesktop.layout.LayoutStyle.*;
+
+public class LoadMultilayerNetworkTaskPanel extends JPanel {
+ /** Creates new form LayerGeneratorPanel */
+ public LoadMultilayerNetworkTaskPanel() {
+ initComponents();
+ }
+
+ /** This method is called from within the constructor to
+ * initialize the form.
+ * WARNING: Do NOT modify this code. The content of this method is
+ * always regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ private void initComponents() {}
+
+// jPanel1 = new javax.swing.JPanel();
+// jLabel1 = new javax.swing.JLabel();
+// jPanel3 = new javax.swing.JPanel();
+// jPanel5 = new javax.swing.JPanel();
+// jScrollPane3 = new javax.swing.JScrollPane();
+// jTable1 = new javax.swing.JTable();
+// LayerPanel = new javax.swing.JPanel();
+// jPanel7 = new javax.swing.JPanel();
+// jScrollPane2 = new javax.swing.JScrollPane();
+// jList2 = new javax.swing.JList();
+// jPanel6 = new javax.swing.JPanel();
+// jButton6 = new javax.swing.JButton();
+// jButton3 = new javax.swing.JButton();
+// jButton4 = new javax.swing.JButton();
+// jButton5 = new javax.swing.JButton();
+// jPanel4 = new javax.swing.JPanel();
+// jScrollPane1 = new javax.swing.JScrollPane();
+// jList1 = new javax.swing.JList();
+// jPanel2 = new javax.swing.JPanel();
+// jButton1 = new javax.swing.JButton();
+// jButton2 = new javax.swing.JButton();
+// jButton7 = new javax.swing.JButton();
+//
+// jPanel1.setBackground(java.awt.Color.white);
+//
+// jLabel1.setFont(new java.awt.Font("SansSerif", 1, 14)); // NOI18N
+// jLabel1.setText("3D Layer Generator");
+//
+// GroupLayout jPanel1Layout = new GroupLayout(jPanel1);
+// jPanel1.setLayout(jPanel1Layout);
+// jPanel1Layout.setHorizontalGroup(
+// jPanel1Layout.createParallelGroup(LEADING)
+// .add(jPanel1Layout.createSequentialGroup()
+// .addContainerGap()
+// .add(jLabel1)
+// .addContainerGap(326, Short.MAX_VALUE))
+// );
+// jPanel1Layout.setVerticalGroup(
+// jPanel1Layout.createParallelGroup(LEADING).
+// add(jPanel1Layout.createSequentialGroup()
+// .addContainerGap()
+// .add(jLabel1, GroupLayout.PREFERRED_SIZE, 31,
GroupLayout.PREFERRED_SIZE)
+// .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+// );
+//
+// jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Inter-Layer Edges", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 12))); // NOI18N
+//
+// jTable1.setModel(new javax.swing.table.DefaultTableModel(
+// new Object [][] {
+// {null, null},
+// {null, null},
+// {null, null},
+// {null, null},
+// {null, null},
+// {null, null},
+// {null, null},
+// {null, null}
+// },
+// new String [] {
+// "Layer", "Inter Layer Network"
+// }
+// ));
+// jScrollPane3.setViewportView(jTable1);
+//
+// GroupLayout jPanel5Layout = new GroupLayout(jPanel5);
+// jPanel5.setLayout(jPanel5Layout);
+// jPanel5Layout.setHorizontalGroup(
+// jPanel5Layout.createParallelGroup(LEADING).
+// add(jScrollPane3, GroupLayout.DEFAULT_SIZE, 463, Short.MAX_VALUE)
+// );
+// jPanel5Layout.setVerticalGroup(
+// jPanel5Layout.createParallelGroup(LEADING)
+// .add(jScrollPane3, TRAILING, GroupLayout.DEFAULT_SIZE, 110,
Short.MAX_VALUE)
+// );
+//
+//
LayerPanel.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createEtchedBorder(),
javax.swing.BorderFactory.createTitledBorder(null, "Define Layers",
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 12)))); // NOI18N
+//
+// jPanel7.setBackground(new java.awt.Color(255, 255, 255));
+// jPanel7.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Available Networks", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 12))); // NOI18N
+// jPanel7.setPreferredSize(new java.awt.Dimension(200, 200));
+//
+// jList2.setModel(new javax.swing.AbstractListModel() {
+// String[] strings = { "Network 1", "Network 2", "Network 3",
"Network 4", "Network 5", " " };
+// public int getSize() { return strings.length; }
+// public Object getElementAt(int i) { return strings[i]; }
+// });
+// jScrollPane2.setViewportView(jList2);
+//
+// GroupLayout jPanel7Layout = new GroupLayout(jPanel7);
+// jPanel7.setLayout(jPanel7Layout);
+// jPanel7Layout.setHorizontalGroup(
+// jPanel7Layout.createParallelGroup(LEADING)
+// .addGroup(jPanel7Layout.createSequentialGroup()
+// .addContainerGap()
+// .addComponent(jScrollPane2, GroupLayout.DEFAULT_SIZE, 164,
Short.MAX_VALUE)
+// .addContainerGap())
+// );
+// jPanel7Layout.setVerticalGroup(
+// jPanel7Layout.createParallelGroup(LEADING)
+// .addGroup(jPanel7Layout.createSequentialGroup()
+// .addComponent(jScrollPane2, GroupLayout.DEFAULT_SIZE, 161,
Short.MAX_VALUE)
+// .addContainerGap())
+// );
+//
+// jButton6.setText(">>");
+// jButton6.addActionListener(new java.awt.event.ActionListener() {
+// public void actionPerformed(java.awt.event.ActionEvent evt) {
+// jButton6ActionPerformed(evt);
+// }
+// });
+//
+// jButton3.setText(">");
+// jButton3.addActionListener(new java.awt.event.ActionListener() {
+// public void actionPerformed(java.awt.event.ActionEvent evt) {
+// jButton3ActionPerformed(evt);
+// }
+// });
+//
+// jButton4.setText("<");
+//
+// jButton5.setText("<<");
+//
+// GroupLayout jPanel6Layout = new GroupLayout(jPanel6);
+// jPanel6.setLayout(jPanel6Layout);
+// jPanel6Layout.setHorizontalGroup(
+// jPanel6Layout.createParallelGroup(LEADING)
+// .addComponent(jButton6, GroupLayout.DEFAULT_SIZE,
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// .addComponent(jButton3, GroupLayout.DEFAULT_SIZE, 45,
Short.MAX_VALUE)
+// .addComponent(jButton4, GroupLayout.DEFAULT_SIZE, 45,
Short.MAX_VALUE)
+// .addComponent(jButton5, GroupLayout.DEFAULT_SIZE,
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// );
+// jPanel6Layout.setVerticalGroup(
+// jPanel6Layout.createParallelGroup(LEADING)
+// .addGroup(TRAILING, jPanel6Layout.createSequentialGroup()
+// .addComponent(jButton6)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+// .addComponent(jButton3)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+// .addComponent(jButton4)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+// .addComponent(jButton5))
+// );
+//
+// jPanel4.setBackground(new java.awt.Color(255, 255, 255));
+// jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Layers", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 12))); // NOI18N
+// jPanel4.setPreferredSize(new java.awt.Dimension(200, 200));
+//
+// jList1.setModel(new javax.swing.AbstractListModel() {
+// String[] strings = { "Network 1", "Network 2", "Network 3",
"Network 4", "Network 5", " " };
+// public int getSize() { return strings.length; }
+// public Object getElementAt(int i) { return strings[i]; }
+// });
+// jScrollPane1.setViewportView(jList1);
+//
+// GroupLayout jPanel4Layout = new GroupLayout(jPanel4);
+// jPanel4.setLayout(jPanel4Layout);
+// jPanel4Layout.setHorizontalGroup(
+// jPanel4Layout.createParallelGroup(LEADING)
+// .addGroup(jPanel4Layout.createSequentialGroup()
+// .addContainerGap()
+// .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 164,
Short.MAX_VALUE)
+// .addContainerGap())
+// );
+// jPanel4Layout.setVerticalGroup(
+// jPanel4Layout.createParallelGroup(LEADING)
+// .addGroup(jPanel4Layout.createSequentialGroup()
+// .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE, 161,
Short.MAX_VALUE)
+// .addContainerGap())
+// );
+//
+// GroupLayout LayerPanelLayout = new GroupLayout(LayerPanel);
+// LayerPanel.setLayout(LayerPanelLayout);
+// LayerPanelLayout.setHorizontalGroup(
+// LayerPanelLayout.createParallelGroup(LEADING)
+// .addGroup(LayerPanelLayout.createSequentialGroup()
+// .addComponent(jPanel7, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+// .addComponent(jPanel6, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+// .addComponent(jPanel4, GroupLayout.DEFAULT_SIZE,
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+// );
+// LayerPanelLayout.setVerticalGroup(
+// LayerPanelLayout.createParallelGroup(LEADING)
+// .addComponent(jPanel7, GroupLayout.DEFAULT_SIZE,
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// .addComponent(jPanel4, TRAILING, GroupLayout.DEFAULT_SIZE,
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// .addGroup(LayerPanelLayout.createSequentialGroup()
+// .addGap(41, 41, 41)
+// .addComponent(jPanel6, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+// .addContainerGap(45, Short.MAX_VALUE))
+// );
+//
+// GroupLayout jPanel3Layout = new GroupLayout(jPanel3);
+// jPanel3.setLayout(jPanel3Layout);
+// jPanel3Layout.setHorizontalGroup(
+// jPanel3Layout.createParallelGroup(LEADING)
+// .addGroup(jPanel3Layout.createSequentialGroup()
+// .addGroup(jPanel3Layout.createParallelGroup(TRAILING, false)
+// .addComponent(jPanel5, LEADING,
GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// .addComponent(LayerPanel, LEADING,
GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+// .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+// );
+// jPanel3Layout.setVerticalGroup(
+// jPanel3Layout.createParallelGroup(LEADING)
+// .addGroup(jPanel3Layout.createSequentialGroup()
+// .addComponent(LayerPanel, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED,
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// .addComponent(jPanel5, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+// );
+//
+// jPanel2.setBackground(new java.awt.Color(255, 255, 255));
+//
+// jButton1.setText("Cancel");
+// jButton1.addActionListener(new java.awt.event.ActionListener() {
+// public void actionPerformed(java.awt.event.ActionEvent evt) {
+// jButton1ActionPerformed(evt);
+// }
+// });
+//
+// jButton2.setText("Generate");
+//
+// jButton7.setText("Options");
+//
+// GroupLayout jPanel2Layout = new GroupLayout(jPanel2);
+// jPanel2.setLayout(jPanel2Layout);
+// jPanel2Layout.setHorizontalGroup(
+// jPanel2Layout.createParallelGroup(LEADING)
+// .addGroup(TRAILING, jPanel2Layout.createSequentialGroup()
+// .addContainerGap()
+// .addComponent(jButton7)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED,
224, Short.MAX_VALUE)
+// .addComponent(jButton2)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+// .addComponent(jButton1)
+// .addContainerGap())
+// );
+// jPanel2Layout.setVerticalGroup(
+// jPanel2Layout.createParallelGroup(LEADING)
+// .addGroup(TRAILING, jPanel2Layout.createSequentialGroup()
+// .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// .addGroup(jPanel2Layout.createParallelGroup(BASELINE)
+// .addComponent(jButton1)
+// .addComponent(jButton2)
+// .addComponent(jButton7))
+// .addContainerGap())
+// );
+//
+// GroupLayout layout = new GroupLayout(this);
+// this.setLayout(layout);
+// layout.setHorizontalGroup(
+// layout.createParallelGroup(LEADING)
+// .addComponent(jPanel2, GroupLayout.DEFAULT_SIZE,
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// .addComponent(jPanel1, GroupLayout.DEFAULT_SIZE,
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+// .addComponent(jPanel3, GroupLayout.DEFAULT_SIZE, 474,
Short.MAX_VALUE)
+// );
+// layout.setVerticalGroup(
+// layout.createParallelGroup(LEADING)
+// .addGroup(layout.createSequentialGroup()
+// .addComponent(jPanel1, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+// .addComponent(jPanel3, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+// .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+// .addComponent(jPanel2, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+// );
+// }// </editor-fold>
+//
+// private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {
+// // TODO add your handling code here:
+// }
+//
+// private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {
+// // TODO add your handling code here:
+// }
+//
+// private void jButton6ActionPerformed(java.awt.event.ActionEvent evt) {
+// // TODO add your handling code here:
+// }
+
+
+ // Variables declaration - do not modify
+ private javax.swing.JPanel LayerPanel;
+ private javax.swing.JButton jButton1;
+ private javax.swing.JButton jButton2;
+ private javax.swing.JButton jButton3;
+ private javax.swing.JButton jButton4;
+ private javax.swing.JButton jButton5;
+ private javax.swing.JButton jButton6;
+ private javax.swing.JButton jButton7;
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JList jList1;
+ private javax.swing.JList jList2;
+ private javax.swing.JPanel jPanel1;
+ private javax.swing.JPanel jPanel2;
+ private javax.swing.JPanel jPanel3;
+ private javax.swing.JPanel jPanel4;
+ private javax.swing.JPanel jPanel5;
+ private javax.swing.JPanel jPanel6;
+ private javax.swing.JPanel jPanel7;
+ private javax.swing.JScrollPane jScrollPane1;
+ private javax.swing.JScrollPane jScrollPane2;
+ private javax.swing.JScrollPane jScrollPane3;
+ private javax.swing.JTable jTable1;
+ // End of variables declaration
+
+}
Deleted:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/AbstractLoadMultilayerNetworksTask.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/AbstractLoadMultilayerNetworksTask.java
2009-06-26 22:32:23 UTC (rev 17125)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/AbstractLoadMultilayerNetworksTask.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -1,20 +0,0 @@
-package org.cytoscape.layer.loadnetworks;
-
-import org.cytoscape.work.Task;
-import org.cytoscape.work.TaskMonitor;
-
-abstract class AbstractLoadMultilayerNetworksTask implements Task {
- public AbstractLoadMultilayerNetworksTask(){
-
- }
-
- protected void loadMultilayerNetworks() throws Exception {
-
- }
-
- abstract public void run(TaskMonitor taskMonitor) throws Exception;
-
- public void cancel() {
-
- }
-}
Deleted:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTask.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTask.java
2009-06-26 22:32:23 UTC (rev 17125)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTask.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -1,31 +0,0 @@
-package org.cytoscape.layer.loadnetworks;
-
-import static org.cytoscape.io.DataCategory.NETWORK;
-
-import java.io.File;
-import java.util.Properties;
-
-import org.cytoscape.io.read.CyReaderManager;
-import org.cytoscape.layer.loadnetworks.panel.LoadMultilayerNetworkTaskPanel;
-import org.cytoscape.layout.CyLayouts;
-import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.work.Tunable;
-import org.cytoscape.work.Tunable.Param;
-
-import cytoscape.CyNetworkManager;
-import cytoscape.util.CyNetworkNaming;
-
-public class LoadMultilayerNetworksTask extends
AbstractLoadMultilayerNetworksTask {
-
- public LoadMultilayerNetworksTask(CyNetworkManager netmgr) {
-
- }
-
- /**
- * Executes Task.
- */
- public void run(TaskMonitor taskMonitor) throws Exception {
- LoadMultilayerNetworkTaskPanel panel = new
LoadMultilayerNetworkTaskPanel();
- }
-}
Deleted:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTaskFactoryImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTaskFactoryImpl.java
2009-06-26 22:32:23 UTC (rev 17125)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/loadnetworks/LoadMultilayerNetworksTaskFactoryImpl.java
2009-06-26 22:50:48 UTC (rev 17126)
@@ -1,19 +0,0 @@
-package org.cytoscape.layer.loadnetworks;
-
-import org.cytoscape.work.Task;
-import org.cytoscape.work.TaskFactory;
-
-import cytoscape.CyNetworkManager;
-
-public class LoadMultilayerNetworksTaskFactoryImpl implements TaskFactory {
-
- private CyNetworkManager netmgr;
-
- public LoadMultilayerNetworksTaskFactoryImpl(CyNetworkManager netmgr) {
- this.netmgr = netmgr;
- }
-
- public Task getTask() {
- return new LoadMultilayerNetworksTask(netmgr);
- }
-}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-06-26 22:32:23 UTC (rev 17125)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-06-26 22:50:48 UTC (rev 17126)
@@ -10,14 +10,14 @@
interface="org.cytoscape.io.read.CyWriterManager"/>
<osgi:reference
id="cySessionManagerServiceRef"
interface="org.cytoscape.session.CySessionManager"/>
- -->
+
- <osgi:service id="ExampleServiceService" ref="ExampleService">
- interface="org.cytoscape.work.TaskFactory">
+ <osgi:service id="ExampleServiceService" ref="ExampleService"
interface="org.cytoscape.work.TaskFactory">
<osgi:service-properties>
<entry key="title" value="Build Multi Layer Network
..." />
<entry key="preferredMenu" value="Plugins.Create
Multylayer" />
</osgi:service-properties>
</osgi:service>
+-->
</beans>
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
2009-06-26 22:32:23 UTC (rev 17125)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
2009-06-26 22:50:48 UTC (rev 17126)
@@ -26,8 +26,6 @@
<!-- this creates a LoadPropsInterceptor object -->
- <bean id="ExampleService"
- class="org.cytoscape.layer.internal.ExampleServiceImpl">
- </bean>
+
</beans>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
