Author: kono
Date: 2009-05-28 13:43:47 -0700 (Thu, 28 May 2009)
New Revision: 16830
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/AbstractVisualStyleEvent.java
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/VisualStyleCreatedEventImpl.java
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/VisualStyleDestroyedEventImpl.java
Log:
Modified for VizMap GUI.
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2009-05-28 20:43:14 UTC (rev 16829)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2009-05-28 20:43:47 UTC (rev 16830)
@@ -128,7 +128,7 @@
}
visualStyles.add(copyVS);
- cyEventHelper.fireSynchronousEvent(new
VisualStyleCreatedEventImpl(copyVS),
+ cyEventHelper.fireSynchronousEvent(new
VisualStyleCreatedEventImpl(copyVS, this),
VisualStyleCreatedListener.class);
return copyVS;
@@ -144,7 +144,7 @@
public VisualStyle createVisualStyle(String title) {
final VisualStyle newVS = new VisualStyleImpl(rootLexicon,
title);
visualStyles.add(newVS);
- cyEventHelper.fireSynchronousEvent(new
VisualStyleCreatedEventImpl(newVS),
+ cyEventHelper.fireSynchronousEvent(new
VisualStyleCreatedEventImpl(newVS, this),
VisualStyleCreatedListener.class);
return newVS;
@@ -158,7 +158,7 @@
*/
public void removeVisualStyle(VisualStyle vs) {
visualStyles.remove(vs);
- cyEventHelper.fireSynchronousEvent(new
VisualStyleDestroyedEventImpl(vs),
+ cyEventHelper.fireSynchronousEvent(new
VisualStyleDestroyedEventImpl(vs, this),
VisualStyleDestroyedListener.class);
vs = null;
}
@@ -172,8 +172,17 @@
return visualStyles;
}
- public RootVisualLexicon getRendererCatalog() {
+ public RootVisualLexicon getRoorVisualLexicon() {
// TODO Auto-generated method stub
return null;
}
+
+ public <K, V> VisualMappingFunction<K, V> createMapping(String
mappingType,
+ String attrName, Class<K> attrType, VisualProperty<V>
vp) {
+
+
+
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2009-05-28 20:43:14 UTC (rev 16829)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2009-05-28 20:43:47 UTC (rev 16830)
@@ -247,7 +247,7 @@
return mappings.values();
}
- public VisualLexicon getRenderer() {
+ public VisualLexicon getVisualLexicon() {
// TODO Auto-generated method stub
return null;
}
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/AbstractVisualStyleEvent.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/AbstractVisualStyleEvent.java
2009-05-28 20:43:14 UTC (rev 16829)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/AbstractVisualStyleEvent.java
2009-05-28 20:43:47 UTC (rev 16830)
@@ -40,24 +40,18 @@
/**
* DOCUMENT ME!
*/
-public class AbstractVisualStyleEvent {
- private VisualStyle vs;
-
+public abstract class AbstractVisualStyleEvent {
+
+ protected VisualStyle vs;
+ protected Object source;
+
/**
* Creates a new AbstractVisualStyleEvent object.
*
* @param vs DOCUMENT ME!
*/
- public AbstractVisualStyleEvent(final VisualStyle vs) {
+ public AbstractVisualStyleEvent(final VisualStyle vs, final Object
source) {
this.vs = vs;
+ this.source = source;
}
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public VisualStyle getSource() {
- return vs;
- }
}
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/VisualStyleCreatedEventImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/VisualStyleCreatedEventImpl.java
2009-05-28 20:43:14 UTC (rev 16829)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/VisualStyleCreatedEventImpl.java
2009-05-28 20:43:47 UTC (rev 16830)
@@ -41,14 +41,24 @@
/**
* DOCUMENT ME!
*/
-public class VisualStyleCreatedEventImpl extends AbstractVisualStyleEvent
+public class VisualStyleCreatedEventImpl extends AbstractVisualStyleEvent
implements VisualStyleCreatedEvent {
+
+
/**
* Creates a new VisualStyleCreatedEventImpl object.
*
* @param vs DOCUMENT ME!
*/
- public VisualStyleCreatedEventImpl(final VisualStyle vs) {
- super(vs);
+ public VisualStyleCreatedEventImpl(final VisualStyle vs, final Object
source) {
+ super(vs, source);
}
+
+ public VisualStyle getCreatedVisualStyle() {
+ return vs;
+ }
+
+ public Object getSource() {
+ return source;
+ }
}
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/VisualStyleDestroyedEventImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/VisualStyleDestroyedEventImpl.java
2009-05-28 20:43:14 UTC (rev 16829)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/events/VisualStyleDestroyedEventImpl.java
2009-05-28 20:43:47 UTC (rev 16830)
@@ -48,7 +48,15 @@
*
* @param vs DOCUMENT ME!
*/
- public VisualStyleDestroyedEventImpl(final VisualStyle vs) {
- super(vs);
+ public VisualStyleDestroyedEventImpl(final VisualStyle vs, final Object
source) {
+ super(vs, source);
}
+
+ public Object getSource() {
+ return source;
+ }
+
+ public VisualStyle getDestroyedVisualStyle() {
+ return vs;
+ }
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
