ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1507332 - in /ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin: ./ component/
Date Fri, 26 Jul 2013 14:30:55 GMT
Author: marrs
Date: Fri Jul 26 14:30:55 2013
New Revision: 1507332

URL: http://svn.apache.org/r1507332
Log:
Added a proper refresh to each table to make sure it stays in sync after login/checkout. Removed
lots of irrelevant inheritDoc comments.

Modified:
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/ArtifactsPanel.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/DistributionsPanel.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/FeaturesPanel.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/TargetsPanel.java

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java?rev=1507332&r1=1507331&r2=1507332&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
(original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
Fri Jul 26 14:30:55 2013
@@ -71,6 +71,7 @@ import org.osgi.service.useradmin.Author
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
 
+import com.sun.imageio.spi.RAFImageInputStreamSpi;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
@@ -501,11 +502,10 @@ public class VaadinClient extends com.va
         });
 
         addListener(m_mainToolbar, RepositoryObject.PUBLIC_TOPIC_ROOT.concat(RepositoryObject.TOPIC_ALL_SUFFIX));
-        addListener(m_artifactsPanel, ArtifactObject.TOPIC_ALL, RepositoryAdmin.TOPIC_STATUSCHANGED);
-        addListener(m_featuresPanel, FeatureObject.TOPIC_ALL, RepositoryAdmin.TOPIC_STATUSCHANGED);
-        addListener(m_distributionsPanel, DistributionObject.TOPIC_ALL, RepositoryAdmin.TOPIC_STATUSCHANGED);
-        addListener(m_targetsPanel, StatefulTargetObject.TOPIC_ALL, TargetObject.TOPIC_ALL,
-            RepositoryAdmin.TOPIC_STATUSCHANGED);
+        addListener(m_artifactsPanel, ArtifactObject.TOPIC_ALL, RepositoryAdmin.TOPIC_STATUSCHANGED,
RepositoryAdmin.TOPIC_LOGIN, RepositoryAdmin.TOPIC_REFRESH);
+        addListener(m_featuresPanel, FeatureObject.TOPIC_ALL, RepositoryAdmin.TOPIC_STATUSCHANGED,
RepositoryAdmin.TOPIC_LOGIN, RepositoryAdmin.TOPIC_REFRESH);
+        addListener(m_distributionsPanel, DistributionObject.TOPIC_ALL, RepositoryAdmin.TOPIC_STATUSCHANGED,
RepositoryAdmin.TOPIC_LOGIN, RepositoryAdmin.TOPIC_REFRESH);
+        addListener(m_targetsPanel, StatefulTargetObject.TOPIC_ALL, TargetObject.TOPIC_ALL,
RepositoryAdmin.TOPIC_STATUSCHANGED, RepositoryAdmin.TOPIC_LOGIN, RepositoryAdmin.TOPIC_REFRESH);
 
         m_mainWindow.addComponent(m_grid);
     }

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/ArtifactsPanel.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/ArtifactsPanel.java?rev=1507332&r1=1507331&r2=1507332&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/ArtifactsPanel.java
(original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/ArtifactsPanel.java
Fri Jul 26 14:30:55 2013
@@ -48,9 +48,6 @@ public abstract class ArtifactsPanel ext
         super(associations, associationRemover, "Artifact", UIExtensionFactory.EXTENSION_POINT_VALUE_ARTIFACT,
true);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean doRemoveRightSideAssociation(ArtifactObject object, RepositoryObject
other) {
         List<Artifact2FeatureAssociation> associations = object.getAssociationsWith((FeatureObject)
other);
@@ -60,9 +57,6 @@ public abstract class ArtifactsPanel ext
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected void handleEvent(String topic, RepositoryObject entity, org.osgi.service.event.Event
event) {
         ArtifactObject artifact = (ArtifactObject) entity;
         if (ArtifactObject.TOPIC_ADDED.equals(topic)) {
@@ -76,17 +70,11 @@ public abstract class ArtifactsPanel ext
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean isSupportedEntity(RepositoryObject entity) {
         return (entity instanceof ArtifactObject) && !isResourceProcessor((ArtifactObject)
entity);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void populateItem(ArtifactObject artifact, Item item) {
         item.getItemProperty(WORKING_STATE_ICON).setValue(getWorkingStateIcon(artifact));

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java?rev=1507332&r1=1507331&r2=1507332&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
(original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
Fri Jul 26 14:30:55 2013
@@ -254,6 +254,9 @@ abstract class BaseObjectPanel<REPO_OBJ 
                     refreshRenderedCells();
                 }
             }
+            else if (RepositoryAdmin.TOPIC_REFRESH.equals(topic) || RepositoryAdmin.TOPIC_LOGIN.equals(topic))
{
+                populate();
+            }
         }
     }
 

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/DistributionsPanel.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/DistributionsPanel.java?rev=1507332&r1=1507331&r2=1507332&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/DistributionsPanel.java
(original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/DistributionsPanel.java
Fri Jul 26 14:30:55 2013
@@ -50,9 +50,6 @@ public abstract class DistributionsPanel
             true /* hasEdit */);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean doRemoveLeftSideAssociation(DistributionObject object, RepositoryObject
other) {
         List<Feature2DistributionAssociation> associations = object.getAssociationsWith((FeatureObject)
other);
@@ -62,9 +59,6 @@ public abstract class DistributionsPanel
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean doRemoveRightSideAssociation(DistributionObject object, RepositoryObject
other) {
         List<Distribution2TargetAssociation> associations = object.getAssociationsWith((TargetObject)
other);
@@ -74,9 +68,6 @@ public abstract class DistributionsPanel
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected void handleEvent(String topic, RepositoryObject entity, org.osgi.service.event.Event
event) {
         DistributionObject distribution = (DistributionObject) entity;
         if (DistributionObject.TOPIC_ADDED.equals(topic)) {
@@ -90,17 +81,11 @@ public abstract class DistributionsPanel
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean isSupportedEntity(RepositoryObject entity) {
         return entity instanceof DistributionObject;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void populateItem(DistributionObject distribution, Item item) {
         item.getItemProperty(WORKING_STATE_ICON).setValue(getWorkingStateIcon(distribution));

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/FeaturesPanel.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/FeaturesPanel.java?rev=1507332&r1=1507331&r2=1507332&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/FeaturesPanel.java
(original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/FeaturesPanel.java
Fri Jul 26 14:30:55 2013
@@ -49,9 +49,6 @@ public abstract class FeaturesPanel exte
         super(associations, associationRemover, "Feature", UIExtensionFactory.EXTENSION_POINT_VALUE_FEATURE,
true);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean doRemoveLeftSideAssociation(FeatureObject object, RepositoryObject
other) {
         List<Artifact2FeatureAssociation> associations = object.getAssociationsWith((ArtifactObject)
other);
@@ -61,9 +58,6 @@ public abstract class FeaturesPanel exte
         return true;
     }
     
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean doRemoveRightSideAssociation(FeatureObject object, RepositoryObject
other) {
         List<Feature2DistributionAssociation> associations = object.getAssociationsWith((DistributionObject)
other);
@@ -73,9 +67,6 @@ public abstract class FeaturesPanel exte
         return true;
     }
     
-    /**
-     * {@inheritDoc}
-     */
     protected void handleEvent(String topic, RepositoryObject entity, org.osgi.service.event.Event
event) {
         FeatureObject feature = (FeatureObject) entity;
         if (FeatureObject.TOPIC_ADDED.equals(topic)) {
@@ -89,17 +80,11 @@ public abstract class FeaturesPanel exte
         }
     }
     
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean isSupportedEntity(RepositoryObject entity) {
         return entity instanceof FeatureObject;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void populateItem(FeatureObject feature, Item item) {
         item.getItemProperty(WORKING_STATE_ICON).setValue(getWorkingStateIcon(feature));

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/TargetsPanel.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/TargetsPanel.java?rev=1507332&r1=1507331&r2=1507332&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/TargetsPanel.java
(original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/TargetsPanel.java
Fri Jul 26 14:30:55 2013
@@ -20,6 +20,7 @@ package org.apache.ace.webui.vaadin.comp
 
 import java.util.List;
 
+import org.apache.ace.client.repository.RepositoryAdmin;
 import org.apache.ace.client.repository.RepositoryObject;
 import org.apache.ace.client.repository.RepositoryObject.WorkingState;
 import org.apache.ace.client.repository.object.Distribution2TargetAssociation;
@@ -56,9 +57,6 @@ public abstract class TargetsPanel exten
         super(associations, associationRemover, "Target", UIExtensionFactory.EXTENSION_POINT_VALUE_TARGET,
true /* hasEdit */);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected Button createRemoveItemButton(StatefulTargetObject object) {
         Button b = super.createRemoveItemButton(object);
@@ -66,9 +64,6 @@ public abstract class TargetsPanel exten
         return b;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected void defineTableColumns() {
         addContainerProperty(WORKING_STATE_ICON, Embedded.class, null, "", null, ALIGN_CENTER);
 
@@ -86,9 +81,6 @@ public abstract class TargetsPanel exten
         setColumnWidth(PROVISIONING_STATE_ICON, ICON_WIDTH);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean doRemoveLeftSideAssociation(StatefulTargetObject object, RepositoryObject
other) {
         List<Distribution2TargetAssociation> associations = object.getAssociationsWith((DistributionObject)
other);
@@ -98,9 +90,6 @@ public abstract class TargetsPanel exten
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected WorkingState getWorkingState(RepositoryObject object) {
         final StatefulTargetObject statefulTarget = (StatefulTargetObject) object;
@@ -110,9 +99,6 @@ public abstract class TargetsPanel exten
         return WorkingState.Unchanged;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected void handleEvent(String topic, RepositoryObject entity, org.osgi.service.event.Event
event) {
         StatefulTargetObject statefulTarget = asStatefulTargetObject(entity);
         if (StatefulTargetObject.TOPIC_ADDED.equals(topic)) {
@@ -126,17 +112,11 @@ public abstract class TargetsPanel exten
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean isSupportedEntity(RepositoryObject entity) {
         return (entity instanceof StatefulTargetObject) || (entity instanceof TargetObject);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected void populateItem(StatefulTargetObject object, Item item) {
         item.getItemProperty(WORKING_STATE_ICON).setValue(getWorkingStateIcon(object));
 
@@ -149,10 +129,6 @@ public abstract class TargetsPanel exten
         item.getItemProperty(ACTIONS).setValue(createActionButtons(object));
     }
 
-    /**
-     * @param object
-     * @return
-     */
     private Embedded getProvisioningStateIcon(StatefulTargetObject object) {
         String name = object.getProvisioningState().name();
         Resource res = createIconResource("target_provisioning_" + name);



Mime
View raw message