Author: clopes
Date: 2011-09-29 14:34:45 -0700 (Thu, 29 Sep 2011)
New Revision: 27024
Added:
csplugins/trunk/toronto/clopes/mcode/src/main/resources/mcode.properties
Modified:
csplugins/trunk/toronto/clopes/mcode/pom.xml
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/CyActivator.java
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/MCODEAboutAction.java
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/util/MCODEUtil.java
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/view/MCODEAboutDialog.java
Log:
Fixed About Dialog's version and date (added mcode.properties file)
Modified: csplugins/trunk/toronto/clopes/mcode/pom.xml
===================================================================
--- csplugins/trunk/toronto/clopes/mcode/pom.xml 2011-09-29 20:50:42 UTC
(rev 27023)
+++ csplugins/trunk/toronto/clopes/mcode/pom.xml 2011-09-29 21:34:45 UTC
(rev 27024)
@@ -25,14 +25,14 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
- <include>**/*.xml</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
- <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
</excludes>
</resource>
</resources>
Modified:
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/CyActivator.java
2011-09-29 20:50:42 UTC (rev 27023)
+++
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/CyActivator.java
2011-09-29 21:34:45 UTC (rev 27024)
@@ -1,42 +1,33 @@
package org.cytoscape.mcode.internal;
-import org.cytoscape.work.TaskManager;
-import org.cytoscape.view.model.CyNetworkViewFactory;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.application.swing.CyAction;
+import org.cytoscape.application.swing.CySwingApplication;
+import
org.cytoscape.application.swing.events.CytoPanelComponentSelectedListener;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.mcode.internal.util.MCODEUtil;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.view.vizmap.VisualMappingManager;
-import org.cytoscape.view.model.CyNetworkViewManager;
-import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.service.util.CyServiceRegistrar;
-import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
+import org.cytoscape.model.events.NetworkAddedListener;
+import org.cytoscape.model.events.NetworkDestroyedListener;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
-import org.cytoscape.view.vizmap.VisualStyleFactory;
+import org.cytoscape.service.util.AbstractCyActivator;
+import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.util.swing.FileUtil;
-import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.util.swing.OpenBrowser;
-
-import org.cytoscape.mcode.internal.util.MCODEUtil;
-import org.cytoscape.mcode.internal.MCODEVisualStyleAction;
-import org.cytoscape.mcode.internal.MCODEAboutAction;
-import org.cytoscape.mcode.internal.MCODEOpenAction;
-import org.cytoscape.mcode.internal.MCODEAnalyzeAction;
-import org.cytoscape.mcode.internal.MCODECloseAction;
-import org.cytoscape.mcode.internal.MCODEHelpAction;
-
-import org.cytoscape.model.events.NetworkAddedListener;
-import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
-import
org.cytoscape.application.swing.events.CytoPanelComponentSelectedListener;
-import org.cytoscape.application.swing.CyAction;
-import org.cytoscape.model.events.NetworkDestroyedListener;
-
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
+import org.cytoscape.work.TaskManager;
import org.osgi.framework.BundleContext;
-import org.cytoscape.service.util.AbstractCyActivator;
-
-import java.util.Properties;
-
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
@@ -76,8 +67,8 @@
MCODEOpenAction openAction = new MCODEOpenAction("Open MCODE",
applicationManager, swingApplication, serviceRegistrar, analyzeAction,
mcodeUtil);
MCODECloseAction closeAction = new MCODECloseAction("Close
MCODE", applicationManager, swingApplication, serviceRegistrar, mcodeUtil);
MCODEHelpAction helpAction = new MCODEHelpAction("Help",
applicationManager, swingApplication, openBrowser);
- MCODEAboutAction aboutAction = new MCODEAboutAction("About",
applicationManager, swingApplication, openBrowser, "${project.version}",
"${buildDate}");
MCODEVisualStyleAction visualStyleAction = new
MCODEVisualStyleAction("Apply MCODE style", applicationManager,
swingApplication, visualMappingMgr, mcodeUtil);
+ MCODEAboutAction aboutAction = new MCODEAboutAction("About",
applicationManager, swingApplication, openBrowser, mcodeUtil);
registerService(bc, openAction, CyAction.class, new
Properties());
registerService(bc, closeAction, CyAction.class, new
Properties());
Modified:
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/MCODEAboutAction.java
===================================================================
---
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/MCODEAboutAction.java
2011-09-29 20:50:42 UTC (rev 27023)
+++
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/MCODEAboutAction.java
2011-09-29 21:34:45 UTC (rev 27024)
@@ -4,6 +4,7 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.mcode.internal.util.MCODEUtil;
import org.cytoscape.mcode.internal.view.MCODEAboutDialog;
import org.cytoscape.util.swing.OpenBrowser;
@@ -51,26 +52,23 @@
private static final long serialVersionUID = -8445425993916988045L;
private final OpenBrowser openBrowser;
- private final String version;
- private final String buildDate;
+ private final MCODEUtil mcodeUtil;
public MCODEAboutAction(final String name,
final
CyApplicationManager applicationManager,
final
CySwingApplication swingApplication,
final OpenBrowser
openBrowser,
- final String version,
- final String buildDate)
{
+ final MCODEUtil
mcodeUtil) {
super(name, applicationManager, swingApplication);
this.openBrowser = openBrowser;
- this.version = version;
- this.buildDate = buildDate;
+ this.mcodeUtil = mcodeUtil;
setPreferredMenu("Plugins.MCODE");
}
@Override
public void actionPerformed(ActionEvent e) {
//display about box
- MCODEAboutDialog aboutDialog = new
MCODEAboutDialog(swingApplication, openBrowser, version, buildDate);
+ MCODEAboutDialog aboutDialog = new
MCODEAboutDialog(swingApplication, openBrowser, mcodeUtil);
aboutDialog.pack();
aboutDialog.setVisible(true);
}
Modified:
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/util/MCODEUtil.java
===================================================================
---
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/util/MCODEUtil.java
2011-09-29 20:50:42 UTC (rev 27023)
+++
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/util/MCODEUtil.java
2011-09-29 21:34:45 UTC (rev 27024)
@@ -13,6 +13,7 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
import java.text.DateFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
@@ -23,6 +24,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.Map.Entry;
@@ -34,6 +36,7 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.mcode.internal.CyActivator;
import org.cytoscape.mcode.internal.model.MCODEAlgorithm;
import org.cytoscape.mcode.internal.model.MCODECluster;
import org.cytoscape.mcode.internal.model.MCODECurrentParameters;
@@ -124,6 +127,7 @@
private final VisualMappingFunctionFactory discreteMappingFactory;
private final VisualMappingFunctionFactory continuousMappingFactory;
private final FileUtil fileUtil;
+ private final Properties props;
private boolean interrupted;
private Image placeHolderImage;
@@ -163,13 +167,18 @@
this.discreteMappingFactory = discreteMappingFactory;
this.continuousMappingFactory = continuousMappingFactory;
this.fileUtil = fileUtil;
-
+ this.props = loadProperties("/mcode.properties");
+
this.reset();
}
public int getCurrentResultId() {
return currentResultId;
}
+
+ public String getProperty(String key) {
+ return props.getProperty(key);
+ }
public void reset() {
currentResultId = 1;
@@ -739,4 +748,21 @@
return false;
}
+
+ private static Properties loadProperties(String name) {
+ Properties props = new Properties();
+
+ try {
+ InputStream in =
CyActivator.class.getResourceAsStream(name);
+
+ if (in != null) {
+ props.load(in);
+ in.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return props;
+ }
}
Modified:
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/view/MCODEAboutDialog.java
===================================================================
---
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/view/MCODEAboutDialog.java
2011-09-29 20:50:42 UTC (rev 27023)
+++
csplugins/trunk/toronto/clopes/mcode/src/main/java/org/cytoscape/mcode/internal/view/MCODEAboutDialog.java
2011-09-29 21:34:45 UTC (rev 27024)
@@ -11,6 +11,7 @@
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.mcode.internal.util.MCODEResources;
+import org.cytoscape.mcode.internal.util.MCODEUtil;
import org.cytoscape.mcode.internal.util.MCODEResources.ImageName;
import org.cytoscape.util.swing.OpenBrowser;
@@ -66,12 +67,12 @@
public MCODEAboutDialog(final CySwingApplication swingApplication,
final OpenBrowser
openBrowser,
- final String version,
- final String buildDate)
{
+ final MCODEUtil
mcodeUtil) {
super(swingApplication.getJFrame(), "About MCODE", false);
this.openBrowser = openBrowser;
- this.version = version;
- this.buildDate = buildDate;
+
+ version = mcodeUtil.getProperty("project.version");
+ buildDate = mcodeUtil.getProperty("buildDate");
setResizable(false);
setContentPane(getMainContainer());
Added: csplugins/trunk/toronto/clopes/mcode/src/main/resources/mcode.properties
===================================================================
--- csplugins/trunk/toronto/clopes/mcode/src/main/resources/mcode.properties
(rev 0)
+++ csplugins/trunk/toronto/clopes/mcode/src/main/resources/mcode.properties
2011-09-29 21:34:45 UTC (rev 27024)
@@ -0,0 +1,2 @@
+project.version = ${project.version}
+buildDate = ${buildDate}
\ No newline at end of file
--
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.
