Author: kono
Date: 2010-10-26 13:55:17 -0700 (Tue, 26 Oct 2010)
New Revision: 22481
Modified:
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedEvent.java
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedEvent.java
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/VizmapEventsTest.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
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/VisualStyleFactoryImpl.java
Log:
Event method signatures are modified. Unnecessary parameter removed.
Modified:
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedEvent.java
===================================================================
---
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedEvent.java
2010-10-26 20:47:44 UTC (rev 22480)
+++
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedEvent.java
2010-10-26 20:55:17 UTC (rev 22481)
@@ -42,28 +42,15 @@
* object, it should fire this event.
*
*/
-public final class VisualStyleCreatedEvent extends AbstractCyEvent<Object> {
-
- private final VisualStyle created;
-
+public final class VisualStyleCreatedEvent extends
AbstractCyEvent<VisualStyle> {
+
/**
* Creates an event for the newly created style.
*
- * @param source this is usually the {...@linkplain VisualStyleFactory}.
* @param created the new VisualStyle
*/
- public VisualStyleCreatedEvent(final Object source,
- final VisualStyle created) {
- super(source, VisualStyleCreatedListener.class);
- this.created = created;
+ public VisualStyleCreatedEvent(final VisualStyle created) {
+ super(created, VisualStyleCreatedListener.class);
}
- /**
- * Get the newly created VisualStyle.
- *
- * @return new VisualStyle
- */
- public VisualStyle getCreatedVisualStyle() {
- return created;
- }
}
Modified:
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedEvent.java
===================================================================
---
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedEvent.java
2010-10-26 20:47:44 UTC (rev 22480)
+++
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedEvent.java
2010-10-26 20:55:17 UTC (rev 22481)
@@ -41,30 +41,14 @@
* This event will be fired when {...@linkplain VisualStyle} object is deleted
from
* {...@linkplain VisualMappingManager}.
*/
-public final class VisualStyleDestroyedEvent extends AbstractCyEvent<Object> {
+public final class VisualStyleDestroyedEvent extends
AbstractCyEvent<VisualStyle> {
- private final VisualStyle destroyed;
-
/**
* create an event for the deleted VisualStyle.
*
- * @param source Usually this is the {...@linkplain
VisualMappingManager}.
* @param destroyed VisualStyle to be deleted.
*/
- public VisualStyleDestroyedEvent(final Object source,
- final VisualStyle destroyed) {
- super(source, VisualStyleDestroyedListener.class);
- this.destroyed = destroyed;
+ public VisualStyleDestroyedEvent(final VisualStyle destroyed) {
+ super(destroyed, VisualStyleDestroyedListener.class);
}
-
-
- /**
- * Returns deleted VisualStyle.
- *
- * @return VisualStyle just deleted.
- *
- */
- public VisualStyle getDestroyedVisualStyle() {
- return destroyed;
- }
}
Modified:
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/VizmapEventsTest.java
===================================================================
---
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/VizmapEventsTest.java
2010-10-26 20:47:44 UTC (rev 22480)
+++
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/VizmapEventsTest.java
2010-10-26 20:55:17 UTC (rev 22481)
@@ -14,12 +14,10 @@
public class VizmapEventsTest {
private VisualStyle style;
- private VisualStyleFactory factory;
@Before
public void setUp() throws Exception {
style = createMock(VisualStyle.class);
- factory = createMock(VisualStyleFactory.class);
}
@After
@@ -28,16 +26,16 @@
@Test
public void testVisualStyleCreatedEvent() {
- final VisualStyleCreatedEvent event = new
VisualStyleCreatedEvent(factory, style);
+ final VisualStyleCreatedEvent event = new
VisualStyleCreatedEvent(style);
assertNotNull(event);
- assertEquals(style, event.getCreatedVisualStyle());
+ assertEquals(style, event.getSource());
}
@Test
public void testVisualStyleDestroyedEvent() {
- final VisualStyleDestroyedEvent event = new
VisualStyleDestroyedEvent(factory, style);
+ final VisualStyleDestroyedEvent event = new
VisualStyleDestroyedEvent(style);
assertNotNull(event);
- assertEquals(style, event.getDestroyedVisualStyle());
+ assertEquals(style, event.getSource());
}
@Test
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-10-26 20:47:44 UTC (rev 22480)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-10-26 20:55:17 UTC (rev 22481)
@@ -681,7 +681,7 @@
* Update GUI components when new Visual Style is created.
*/
@Override public void handleEvent(final VisualStyleCreatedEvent e) {
- final VisualStyle newStyle = e.getCreatedVisualStyle();
+ final VisualStyle newStyle = e.getSource();
if(newStyle == null)
return;
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
2010-10-26 20:47:44 UTC (rev 22480)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2010-10-26 20:55:17 UTC (rev 22481)
@@ -103,8 +103,7 @@
*/
private void removeVisualStyle(VisualStyle vs) {
visualStyles.remove(vs);
- cyEventHelper.fireSynchronousEvent(new
VisualStyleDestroyedEvent(this,
- vs));
+ cyEventHelper.fireSynchronousEvent(new
VisualStyleDestroyedEvent(vs));
vs = null;
}
@@ -130,12 +129,12 @@
@Override
public void handleEvent(VisualStyleDestroyedEvent e) {
- removeVisualStyle(e.getDestroyedVisualStyle());
+ removeVisualStyle(e.getSource());
}
@Override
public void handleEvent(VisualStyleCreatedEvent e) {
- addVisualStyle(e.getCreatedVisualStyle());
+ addVisualStyle(e.getSource());
}
}
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
2010-10-26 20:47:44 UTC (rev 22480)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
2010-10-26 20:55:17 UTC (rev 22481)
@@ -33,7 +33,7 @@
vp = mapping.getVisualProperty();
}
- eventHelper.fireSynchronousEvent(new
VisualStyleCreatedEvent(this,copyVS));
+ eventHelper.fireSynchronousEvent(new
VisualStyleCreatedEvent(copyVS));
return copyVS;
}
@@ -43,7 +43,7 @@
public VisualStyle createVisualStyle(String title, final VisualLexicon
lexicon) {
final VisualStyle vs = new VisualStyleImpl(title, lexicon);
- eventHelper.fireSynchronousEvent(new
VisualStyleCreatedEvent(this,vs));
+ eventHelper.fireSynchronousEvent(new
VisualStyleCreatedEvent(vs));
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.
