Author: paperwing
Date: 2012-04-10 09:55:42 -0700 (Tue, 10 Apr 2012)
New Revision: 28780
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/AppManagerAction.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/swing/main/AppManagerDialog.java
Log:
New app-impl project now builds with different artifact id in order allow
installing updated app manager as a bundle alongside old bundle, about to add
messages box to display additional information about selected apps rather than
store all information in table
Modified: csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
===================================================================
--- csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
2012-04-10 16:53:27 UTC (rev 28779)
+++ csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
2012-04-10 16:55:42 UTC (rev 28780)
@@ -8,12 +8,12 @@
</parent>
<properties>
-
<bundle.symbolicName>org.cytoscape.app-impl</bundle.symbolicName>
+
<bundle.symbolicName>org.cytoscape.app2-impl</bundle.symbolicName>
<bundle.namespace>org.cytoscape.app.internal</bundle.namespace>
</properties>
<modelVersion>4.0.0</modelVersion>
- <artifactId>app-impl</artifactId>
+ <artifactId>app2-impl</artifactId>
<name>${bundle.symbolicName}</name>
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/AppManagerAction.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/AppManagerAction.java
2012-04-10 16:53:27 UTC (rev 28779)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/AppManagerAction.java
2012-04-10 16:55:42 UTC (rev 28780)
@@ -20,7 +20,7 @@
private AppManager appManager;
public AppManagerAction(AppManager appManager, CySwingApplication
swingApplication) {
- super("App Manager2");
+ super("App Manager 2");
setPreferredMenu("Apps");
setMenuGravity(1.0f);
@@ -33,7 +33,7 @@
@Override
public void actionPerformed(ActionEvent event) {
- AppManagerDialog appManagerDialog = new
AppManagerDialog(appManager, swingApplication.getJFrame(), true);
+ AppManagerDialog appManagerDialog = new
AppManagerDialog(appManager, swingApplication.getJFrame(), false);
}
}
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-10 16:53:27 UTC (rev 28779)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-10 16:55:42 UTC (rev 28780)
@@ -108,6 +108,10 @@
DataSourceManager dataSourceManager = getService(bc,
DataSourceManager.class);
CyAppAdapterImpl cyAppAdapter = new
CyAppAdapterImpl(cyApplicationManagerRef,cyEventHelperRef,cyLayoutAlgorithmManagerRef,cyNetworkFactoryRef,cyNetworkManagerRef,cyNetworkViewFactoryRef,cyNetworkViewManagerRef,cyNetworkViewReaderManagerRef,cyNetworkViewWriterManagerRef,cyPropertyRef,cyPropertyReaderManagerRef,cyPropertyWriterManagerRef,cyRootNetworkFactoryRef,cyServiceRegistrarRef,cySessionManagerRef,cySessionReaderManagerRef,cySessionWriterManagerRef,cySwingApplicationRef,cyTableFactoryRef,cyTableManagerRef,cyTableReaderManagerRef,cytoscapeVersionService,
dialogTaskManagerRef,panelTaskManagerRef,submenuTaskManagerRef,presentationWriterManagerRef,renderingEngineManagerRef,taskManagerRef,undoSupportRef,
vmfFactoryC, vmfFactoryD, vmfFactoryP,
visualMappingManagerRef,visualStyleFactoryRef, dataSourceManager);
+
+ registerService(bc,cyAppAdapter,CyAppAdapter.class, new
Properties());
+
+ /*
AppLoaderTaskFactory appLoaderTaskFactory = new
AppLoaderTaskFactory(cyAppAdapter);
AppManagerAction appManagerAction = new AppManagerAction(
cySwingApplicationRef,
@@ -121,12 +125,9 @@
cyApplicationConfigurationServiceRef);
StartupMostlyFinished startupMostlyFinished = new
StartupMostlyFinished(cyEventHelperRef);
-
-
- registerService(bc,cyAppAdapter,CyAppAdapter.class, new
Properties());
-
registerService(bc,appLoaderTaskFactory,TaskFactory.class, new
Properties());
registerAllServices(bc,appManagerAction, new Properties());
+ */
// Attempt to instantiate new manager
org.cytoscape.app.internal.manager.AppManager appManager = new
org.cytoscape.app.internal.manager.AppManager(
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/swing/main/AppManagerDialog.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/swing/main/AppManagerDialog.java
2012-04-10 16:53:27 UTC (rev 28779)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/swing/main/AppManagerDialog.java
2012-04-10 16:55:42 UTC (rev 28780)
@@ -44,16 +44,18 @@
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
.addContainerGap()
- .add(mainTabbedPane,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 554,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(mainTabbedPane,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 640,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
.addContainerGap()
- .add(mainTabbedPane,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 388,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(mainTabbedPane,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 490,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
);
+
+ // 554 x 388 default size
pack();
}
--
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.
