Author: kono
Date: 2011-01-04 17:55:08 -0800 (Tue, 04 Jan 2011)
New Revision: 23302
Added:
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/VisualPropertyDependency.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/dependency/
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DependencyTable.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VisualPropertyDependencyManager.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/dependency/
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/dependency/NodeSizeDependency.java
Modified:
core3/ding-customgraphics-manager-impl/trunk/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
core3/ding-customgraphics-manager-impl/trunk/src/main/java/org/cytoscape/ding/impl/customgraphics/PersistImageTaskFactory.java
core3/ding-presentation-impl/trunk/osgi.bnd
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
core3/vizmap-gui-impl/trunk/osgi.bnd
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
Log:
Start adding Visual Property Dependency UI.
Modified:
core3/ding-customgraphics-manager-impl/trunk/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
===================================================================
---
core3/ding-customgraphics-manager-impl/trunk/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
2011-01-05 01:34:38 UTC (rev 23301)
+++
core3/ding-customgraphics-manager-impl/trunk/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
2011-01-05 01:55:08 UTC (rev 23302)
@@ -217,7 +217,7 @@
@Override
public void handleEvent(CytoscapeShutdownEvent e) {
// Persist images
- logger.info("Saving images to: " + imageHomeDirectory);
+ logger.info("Start Saving images to: " + imageHomeDirectory);
// Create Task
final PersistImageTaskFactory factory = new
PersistImageTaskFactory(imageHomeDirectory, this);
@@ -228,7 +228,7 @@
logger.error("Could not save images to disk.", e1);
}
- logger.info("Image saving process finished.");
+ logger.info("========== Image saving process finished
=============");
}
}
Modified:
core3/ding-customgraphics-manager-impl/trunk/src/main/java/org/cytoscape/ding/impl/customgraphics/PersistImageTaskFactory.java
===================================================================
---
core3/ding-customgraphics-manager-impl/trunk/src/main/java/org/cytoscape/ding/impl/customgraphics/PersistImageTaskFactory.java
2011-01-05 01:34:38 UTC (rev 23301)
+++
core3/ding-customgraphics-manager-impl/trunk/src/main/java/org/cytoscape/ding/impl/customgraphics/PersistImageTaskFactory.java
2011-01-05 01:55:08 UTC (rev 23302)
@@ -19,7 +19,6 @@
@Override
public TaskIterator getTaskIterator() {
-
return new TaskIterator(new PersistImageTask(location,
manager));
}
Modified: core3/ding-presentation-impl/trunk/osgi.bnd
===================================================================
--- core3/ding-presentation-impl/trunk/osgi.bnd 2011-01-05 01:34:38 UTC (rev
23301)
+++ core3/ding-presentation-impl/trunk/osgi.bnd 2011-01-05 01:55:08 UTC (rev
23302)
@@ -3,4 +3,5 @@
#-----------------------------------------------------------------
Import-package: *
-Export-Package: org.cytoscape.ding, org.cytoscape.ding.customgraphics.*,
org.cytoscape.ding.impl.*, org.cytoscape.ding.impl.editor,
org.cytoscape.ding.icon, org.cytoscape.ding.impl.visualproperty,
org.cytoscape.ding.impl.strokes
+Private-Package: org.cytoscape.ding.impl, org.cytoscape.ding.impl.*
+Export-Package: org.cytoscape.ding.*;-noimport:=true
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
2011-01-05 01:34:38 UTC (rev 23301)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
2011-01-05 01:55:08 UTC (rev 23302)
@@ -10,7 +10,6 @@
* <p>
* All data fields are immutable.
*
- * @author kono
*
*/
public final class VisualLexiconNode {
@@ -20,6 +19,8 @@
private final VisualLexiconNode parent;
private final Collection<VisualLexiconNode> children;
+ private boolean isDepend;
+
public VisualLexiconNode(final VisualProperty<?> vp, final
VisualLexiconNode parent) {
if(vp == null)
throw new NullPointerException("Visual Property cannot
be null.");
@@ -27,12 +28,22 @@
this.vp = vp;
this.parent = parent;
this.children = new HashSet<VisualLexiconNode>();
+ this.isDepend = false;
if(parent != null)
parent.getChildren().add(this);
}
+
+ public void setDependency(boolean depend) {
+ this.isDepend = depend;
+ }
+
+ public boolean isDepend() {
+ return isDepend;
+ }
+
/**
* Returns wrapped {...@linkplain VisualProerty} object.
*
Added:
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/VisualPropertyDependency.java
===================================================================
---
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/VisualPropertyDependency.java
(rev 0)
+++
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/VisualPropertyDependency.java
2011-01-05 01:55:08 UTC (rev 23302)
@@ -0,0 +1,19 @@
+package org.cytoscape.view.vizmap.gui;
+
+import java.util.Set;
+
+import org.cytoscape.view.model.VisualProperty;
+
+/**
+ * Defines the dependency
+ *
+ */
+public interface VisualPropertyDependency {
+
+ String getDisplayName();
+
+ VisualProperty<?> getParent();
+
+ Set<VisualProperty<?>> getChildren();
+
+}
Modified: core3/vizmap-gui-impl/trunk/osgi.bnd
===================================================================
--- core3/vizmap-gui-impl/trunk/osgi.bnd 2011-01-05 01:34:38 UTC (rev
23301)
+++ core3/vizmap-gui-impl/trunk/osgi.bnd 2011-01-05 01:55:08 UTC (rev
23302)
@@ -3,5 +3,4 @@
#-----------------------------------------------------------------
Import-Package: *
-Export-Package: org.cytoscape.view.vizmap.gui.*
Private-Package: org.cytoscape.view.vizmap.gui.internal.*
\ No newline at end of file
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2011-01-05 01:34:38 UTC (rev 23301)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2011-01-05 01:55:08 UTC (rev 23302)
@@ -116,6 +116,8 @@
private final VizMapperUtil util;
private final DefaultViewPanelImpl mainView;
+
+ //private final DependencyTable depTable;
/**
* Creates a new DefaultAppearenceBuilder object.
@@ -136,6 +138,8 @@
if(mainView == null)
throw new NullPointerException("DefaultViewPanel is
missing.");
+ //this.depTable = depTable;
+
this.vmm = vmm;
this.util = util;
this.selectedManager = selectedManager;
@@ -250,6 +254,8 @@
jXTitledPanel1 = new org.jdesktop.swingx.JXTitledPanel();
defaultObjectTabbedPane = new javax.swing.JTabbedPane();
nodeScrollPane = new javax.swing.JScrollPane();
+ dependencyScrollPane = new javax.swing.JScrollPane();
+
nodeList = new JXList();
edgeList = new JXList();
edgeScrollPane = new javax.swing.JScrollPane();
@@ -303,10 +309,13 @@
nodeScrollPane.setViewportView(nodeList);
edgeScrollPane.setViewportView(edgeList);
globalScrollPane.setViewportView(networkList);
+ //dependencyScrollPane.setViewportView(depTable);
defaultObjectTabbedPane.addTab("Node", nodeScrollPane);
defaultObjectTabbedPane.addTab("Edge", edgeScrollPane);
defaultObjectTabbedPane.addTab("Network", globalScrollPane);
+
+ defaultObjectTabbedPane.addTab("Dependency",
dependencyScrollPane);
GroupLayout jXTitledPanel1Layout = new GroupLayout(
jXTitledPanel1.getContentContainer());
@@ -502,6 +511,10 @@
private javax.swing.JScrollPane nodeScrollPane;
private javax.swing.JScrollPane edgeScrollPane;
private javax.swing.JScrollPane globalScrollPane;
+
+ // New from 3.0
+ private javax.swing.JScrollPane dependencyScrollPane;
+
private javax.swing.JTabbedPane defaultObjectTabbedPane;
private JXList nodeList;
private JXList edgeList;
Added:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DependencyTable.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DependencyTable.java
(rev 0)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DependencyTable.java
2011-01-05 01:55:08 UTC (rev 23302)
@@ -0,0 +1,46 @@
+package org.cytoscape.view.vizmap.gui.internal;
+
+import java.util.Map;
+
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableModel;
+
+import org.cytoscape.view.vizmap.gui.VisualPropertyDependency;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class DependencyTable extends JTable {
+
+ private static final long serialVersionUID = -8052559216229363239L;
+
+ private static final Logger logger =
LoggerFactory.getLogger(DependencyTable.class);
+
+ private final DefaultTableModel model;
+
+ public DependencyTable() {
+ model = new DefaultTableModel();
+ buildModel();
+ this.setModel(model);
+ }
+
+
+ private void buildModel() {
+ model.addColumn("Set Dependency");
+ model.addColumn("Description");
+ }
+
+ public void addDependency(final VisualPropertyDependency dep, Map
props) {
+ logger.debug("------------ New Dependency: " +
dep.getDisplayName());
+
+
+ }
+
+ public void removeDependency(final VisualPropertyDependency dep, Map
props) {
+
+
+
+ }
+
+
+}
Added:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VisualPropertyDependencyManager.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VisualPropertyDependencyManager.java
(rev 0)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VisualPropertyDependencyManager.java
2011-01-05 01:55:08 UTC (rev 23302)
@@ -0,0 +1,5 @@
+package org.cytoscape.view.vizmap.gui.internal;
+
+public class VisualPropertyDependencyManager {
+
+}
Added:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/dependency/NodeSizeDependency.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/dependency/NodeSizeDependency.java
(rev 0)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/dependency/NodeSizeDependency.java
2011-01-05 01:55:08 UTC (rev 23302)
@@ -0,0 +1,29 @@
+package org.cytoscape.view.vizmap.gui.internal.editor.dependency;
+
+import java.util.Set;
+
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.vizmap.gui.VisualPropertyDependency;
+
+public class NodeSizeDependency implements VisualPropertyDependency {
+
+ private static final String NAME = "Lock node width and height";
+
+ @Override
+ public String getDisplayName() {
+ return NAME;
+ }
+
+ @Override
+ public VisualProperty<?> getParent() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Set<VisualProperty<?>> getChildren() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2011-01-05 01:34:38 UTC (rev 23301)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2011-01-05 01:55:08 UTC (rev 23302)
@@ -236,6 +236,20 @@
cardinality="0..N" >
<osgi:listener bind-method="addMappingGenerator"
unbind-method="removeMappingGenerator"
ref="menuManager" />
+ </osgi:set>
+
+
+
+ <!-- Default dependencies
+ <osgi:service id="nodeSizeDepService" ref="nodeSizeDep"
auto-export="interfaces" />
+
+ <osgi:set id="dependencySet"
+
interface="org.cytoscape.view.vizmap.gui.VisualPropertyDependency"
+ cardinality="0..N" >
+ <osgi:listener bind-method="addDependency"
+ unbind-method="removeDependency" ref="dependencyTable"
/>
+
</osgi:set>
-
+
+-->
</beans>
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2011-01-05 01:34:38 UTC (rev 23301)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2011-01-05 01:55:08 UTC (rev 23302)
@@ -180,6 +180,11 @@
<constructor-arg ref="selectedVisualStyleManager" />
</bean>
+ <!--<bean id="dependencyTable"
class="org.cytoscape.view.vizmap.gui.internal.DependencyTable" />-->
+
+ <!--<bean id="nodeSizeDep"
class="org.cytoscape.view.vizmap.gui.internal.editor.dependency.NodeSizeDependency"
/>-->
+
+
<bean name="defViewEditor"
class="org.cytoscape.view.vizmap.gui.internal.DefaultViewEditorImpl"
scope="singleton" depends-on="defaultViewPanel">
@@ -189,6 +194,7 @@
<constructor-arg ref="vmmServiceRef" />
<constructor-arg ref="selectedVisualStyleManager" />
<constructor-arg ref="vizMapperUtil" />
+ <!--<constructor-arg ref="dependencyTable" />-->
</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.
