You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2010/06/23 21:41:07 UTC
svn commit: r957321 - in
/incubator/aries/trunk/samples/goat/goat-web/src/main:
java/org/apache/aries/samples/goat/web/ServerSideClass.java
resources/web/goat/ComponentStatusGrid.js
resources/web/goat/ServerSideInterface.js
Author: zoe
Date: Wed Jun 23 19:41:06 2010
New Revision: 957321
URL: http://svn.apache.org/viewvc?rev=957321&view=rev
Log:
ARIES-319 First guess at RelationshipInfoProvider + minor fix to ComponentStatusGrid
Modified:
incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java
incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js
incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ServerSideInterface.js
Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java?rev=957321&r1=957320&r2=957321&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/java/org/apache/aries/samples/goat/web/ServerSideClass.java Wed Jun 23 19:41:06 2010
@@ -29,6 +29,7 @@ import org.apache.aries.samples.goat.api
import org.apache.aries.samples.goat.api.ComponentInfoProvider;
import org.apache.aries.samples.goat.api.ModelInfoService;
import org.apache.aries.samples.goat.api.RelationshipInfo;
+import org.apache.aries.samples.goat.api.RelationshipInfoProvider;
import org.directwebremoting.Browser;
import org.directwebremoting.ScriptBuffer;
import org.directwebremoting.ScriptSession;
@@ -44,13 +45,14 @@ public class ServerSideClass {
private ModelInfoService ModelInfoService = null;
- private Map<ModelInfoService, ComponentInfoProvider.ComponentInfoListener> listeners = new HashMap<ModelInfoService, ComponentInfoProvider.ComponentInfoListener>();
+ private Map<ModelInfoService, ComponentInfoProvider.ComponentInfoListener> clisteners = new HashMap<ModelInfoService, ComponentInfoProvider.ComponentInfoListener>();
+ private Map<ModelInfoService, RelationshipInfoProvider.RelationshipInfoListener> rlisteners = new HashMap<ModelInfoService, RelationshipInfoProvider.RelationshipInfoListener>();
- private class ListenerImpl implements
+ private class ComponentInfoListenerImpl implements
ComponentInfoProvider.ComponentInfoListener {
String server;
- public ListenerImpl(String server) {
+ public ComponentInfoListenerImpl(String server) {
this.server = server;
}
@@ -68,6 +70,24 @@ public class ServerSideClass {
// todo
}
}
+ private class RelationshipInfoListenerImpl implements
+ RelationshipInfoProvider.RelationshipInfoListener {
+ String server;
+
+ public RelationshipInfoListenerImpl(String server) {
+ this.server = server;
+ }
+
+ public void updateRelationship(RelationshipInfo r) {
+ if (this.server.equals(modelInfoServiceHint)) {
+ addFunctionCall("addRelationship", r);
+ }
+ }
+
+ public void removeRelationship(RelationshipInfo r) {
+ // todo
+ }
+ }
public ServerSideClass() {
System.err.println("SSC Built!");
@@ -147,12 +167,20 @@ public class ServerSideClass {
}
if (this.ModelInfoService != null) {
- if (!listeners.containsKey(this.ModelInfoService)) {
- ComponentInfoProvider.ComponentInfoListener l = new ListenerImpl(
+ if (!rlisteners.containsKey(this.ModelInfoService)) {
+ RelationshipInfoProvider.RelationshipInfoListener rl = new RelationshipInfoListenerImpl(
+ this.modelInfoServiceHint);
+ rlisteners.put(this.ModelInfoService, rl);
+ this.ModelInfoService.getRelationshipInfoProvider()
+ .registerRelationshipInfoListener(rl);
+ }
+
+ if (!clisteners.containsKey(this.ModelInfoService)) {
+ ComponentInfoProvider.ComponentInfoListener cl = new ComponentInfoListenerImpl(
this.modelInfoServiceHint);
- listeners.put(this.ModelInfoService, l);
+ clisteners.put(this.ModelInfoService, cl);
this.ModelInfoService.getComponentInfoProvider()
- .registerComponentInfoListener(l);
+ .registerComponentInfoListener(cl);
}
}
}
Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js?rev=957321&r1=957320&r2=957321&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js Wed Jun 23 19:41:06 2010
@@ -176,7 +176,6 @@ onComponentDelete: function(component){
onComponentUpdate: function(component){
//console.log(">onComponentUpdate");
- var id = component.id;
var bid = component.elements["component.property.BundleID"].value;
var name = component.elements["component.property.SymbolicName"].value;
var state = component.elements["component.property.State"].value;
Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ServerSideInterface.js
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ServerSideInterface.js?rev=957321&r1=957320&r2=957321&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ServerSideInterface.js (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ServerSideInterface.js Wed Jun 23 19:41:06 2010
@@ -101,7 +101,7 @@ function addRelationship(relationship) {
//call back from componentstatusgrid to hide component.. //TODO: see if this can be made unglobal.
function hideComponent(id){
- console.log("In ServerSide blah");
+ console.log("Hiding or showing component");
console.log(components[id]);
components[id].toggleHidden();
}