[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events ...
Robert Stryker
rob.stryker at jboss.com
Mon Mar 19 18:49:39 EDT 2007
User: rawb
Date: 07/03/19 18:49:39
Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events
PollingLabelProvider.java
PackagesPublishLabelProvider.java
ComplexEventLogLabelProvider.java
Removed: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events
PackageBuildLabelProvider.java
PathPublisherLabelProvider.java
Log:
Integration with packages
Removal of path publisher for individual files
Changes to event log label providers
Revision Changes Path
1.4 +5 -5 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PollingLabelProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PollingLabelProvider.java 30 Jan 2007 03:00:59 -0000 1.3
+++ PollingLabelProvider.java 19 Mar 2007 22:49:39 -0000 1.4
@@ -172,10 +172,10 @@
propertyToMessageMap.put(PollThread.EXPECTED_STATE, "Expected State");
// now values and their readable forms
- propertyToMessageMap.put(TwiddlePoller.STATUS + "::" + 0, "Server is Down");
- propertyToMessageMap.put(TwiddlePoller.STATUS + "::" + 1, "Server is Up");
- propertyToMessageMap.put(TwiddlePoller.STATUS + "::" + -1, "Server is in transition");
- propertyToMessageMap.put(PollThread.EXPECTED_STATE + "::" + "true", "Up");
- propertyToMessageMap.put(PollThread.EXPECTED_STATE + "::" + "false", "Down");
+ propertyToMessageMap.put(TwiddlePoller.STATUS + DELIMITER + 0, "Server is Down");
+ propertyToMessageMap.put(TwiddlePoller.STATUS + DELIMITER + 1, "Server is Up");
+ propertyToMessageMap.put(TwiddlePoller.STATUS + DELIMITER + -1, "Server is in transition");
+ propertyToMessageMap.put(PollThread.EXPECTED_STATE + DELIMITER + "true", "Up");
+ propertyToMessageMap.put(PollThread.EXPECTED_STATE + DELIMITER + "false", "Down");
}
}
1.4 +82 -52 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackagesPublishLabelProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PackagesPublishLabelProvider.java 23 Feb 2007 21:57:46 -0000 1.3
+++ PackagesPublishLabelProvider.java 19 Mar 2007 22:49:39 -0000 1.4
@@ -2,10 +2,14 @@
import java.util.ArrayList;
+import org.eclipse.core.runtime.Path;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem;
-import org.jboss.ide.eclipse.as.core.publishers.IJBossServerPublisher;
-import org.jboss.ide.eclipse.as.core.publishers.PackagesPublisher;
+import org.jboss.ide.eclipse.as.core.publishers.PublisherEventLogger;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.IEventLogLabelProvider;
@@ -14,68 +18,94 @@
protected void addSupportedTypes() {
supported = new ArrayList();
- supported.add(PackagesPublisher.REMOVE_TOP_EVENT);
- supported.add(PackagesPublisher.REMOVE_PACKAGE_SUCCESS);
- supported.add(PackagesPublisher.REMOVE_PACKAGE_SKIPPED);
- supported.add(PackagesPublisher.REMOVE_PACKAGE_FAIL);
-
- supported.add(PackagesPublisher.PUBLISH_TOP_EVENT);
- supported.add(PackagesPublisher.PROJECT_BUILD_EVENT);
- supported.add(PackagesPublisher.MOVE_PACKAGE_SUCCESS);
- supported.add(PackagesPublisher.MOVE_PACKAGE_FAIL);
- supported.add(PackagesPublisher.MOVE_PACKAGE_SKIP);
+ supported.add(PublisherEventLogger.SINGLE_MODULE_TOP_EVENT);
+ supported.add(PublisherEventLogger.MULTIPLE_MODULE_TOP_EVENT);
+ supported.add(PublisherEventLogger.FILE_COPPIED_EVENT);
+ supported.add(PublisherEventLogger.FILE_DELETED_EVENT);
+ supported.add(PublisherEventLogger.FOLDER_DELETED_EVENT);
}
protected void loadPropertyMap() {
- propertyToMessageMap.put(IJBossServerPublisher.MODULE_NAME, "Module Name");
- propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.PACKAGE_NAME, "Package Name");
- propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.DESTINATION, "Package File");
- propertyToMessageMap.put(PackagesPublisher.PackagesPublisherMoveEvent.MOVE_SOURCE, "Source File");
- propertyToMessageMap.put(PackagesPublisher.PackagesPublisherMoveEvent.MOVE_DESTINATION, "Destination File");
- propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.EXCEPTION_MESSAGE, "Exception Message");
+ propertyToMessageMap.put(PublisherEventLogger.SOURCE_PROPERTY, "Source");
+ propertyToMessageMap.put(PublisherEventLogger.DEST_PROPERTY, "Destination");
+ propertyToMessageMap.put(PublisherEventLogger.EXCEPTION_MESSAGE, "Exception");
+ propertyToMessageMap.put(PublisherEventLogger.SUCCESS_PROPERTY, "Action Succeeded");
+ propertyToMessageMap.put(PublisherEventLogger.MODULE_NAME, "Module Name");
+ propertyToMessageMap.put(PublisherEventLogger.DELTA_KIND, "Change Type");
+ propertyToMessageMap.put(PublisherEventLogger.MODULE_KIND, "Publish Type");
+
+ propertyToMessageMap.put(PublisherEventLogger.MODULE_KIND + DELIMITER + IServer.PUBLISH_AUTO, "Auto");
+ propertyToMessageMap.put(PublisherEventLogger.MODULE_KIND + DELIMITER + IServer.PUBLISH_CLEAN, "Clean");
+ propertyToMessageMap.put(PublisherEventLogger.MODULE_KIND + DELIMITER + IServer.PUBLISH_FULL, "Full");
+ propertyToMessageMap.put(PublisherEventLogger.MODULE_KIND + DELIMITER + IServer.PUBLISH_INCREMENTAL, "Incremental");
+
+ propertyToMessageMap.put(PublisherEventLogger.DELTA_KIND + DELIMITER + ServerBehaviourDelegate.ADDED, "Added");
+ propertyToMessageMap.put(PublisherEventLogger.DELTA_KIND + DELIMITER + ServerBehaviourDelegate.CHANGED, "Changed");
+ propertyToMessageMap.put(PublisherEventLogger.DELTA_KIND + DELIMITER + ServerBehaviourDelegate.REMOVED, "Removed");
+ propertyToMessageMap.put(PublisherEventLogger.DELTA_KIND + DELIMITER + ServerBehaviourDelegate.NO_CHANGE, "No Change");
+
+
+// propertyToMessageMap.put(IJBossServerPublisher.MODULE_NAME, "Module Name");
+// propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.PACKAGE_NAME, "Package Name");
+// propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.DESTINATION, "Package File");
+// propertyToMessageMap.put(PackagesPublisher.PackagesPublisherMoveEvent.MOVE_SOURCE, "Source File");
+// propertyToMessageMap.put(PackagesPublisher.PackagesPublisherMoveEvent.MOVE_DESTINATION, "Destination File");
+// propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.EXCEPTION_MESSAGE, "Exception Message");
}
public Image getImage(EventLogTreeItem item) {
- String type = item.getSpecificType();
- Image icon = JBossServerUISharedImages.getImage(JBossServerUISharedImages.UNPUBLISH_IMAGE);
- if(type.equals(PackagesPublisher.REMOVE_TOP_EVENT)) return icon;
- if(type.equals(PackagesPublisher.REMOVE_PACKAGE_SUCCESS)) return icon;
- if(type.equals(PackagesPublisher.REMOVE_PACKAGE_SKIPPED)) return icon;
- if(type.equals(PackagesPublisher.REMOVE_PACKAGE_FAIL)) return icon;
-
- icon = JBossServerUISharedImages.getImage(JBossServerUISharedImages.PUBLISH_IMAGE);
- if(type.equals(PackagesPublisher.PUBLISH_TOP_EVENT)) return icon;
- if(type.equals(PackagesPublisher.PROJECT_BUILD_EVENT)) return icon;
- if(type.equals(PackagesPublisher.MOVE_PACKAGE_FAIL)) return icon;
- if(type.equals(PackagesPublisher.MOVE_PACKAGE_SKIP)) return icon;
- if(type.equals(PackagesPublisher.MOVE_PACKAGE_SUCCESS)) return icon;
+ if( item.getProperty(PublisherEventLogger.EXCEPTION_MESSAGE) != null )
+ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+ String type = item.getSpecificType();
+ if( type.equals(PublisherEventLogger.MULTIPLE_MODULE_TOP_EVENT) || type.equals(PublisherEventLogger.SINGLE_MODULE_TOP_EVENT)) {
+ int deltaKind = ((Integer)item.getProperty(PublisherEventLogger.DELTA_KIND)).intValue();
+ Image unpubIcon = JBossServerUISharedImages.getImage(JBossServerUISharedImages.UNPUBLISH_IMAGE);
+ Image pubIcon = JBossServerUISharedImages.getImage(JBossServerUISharedImages.PUBLISH_IMAGE);
+ if( deltaKind == ServerBehaviourDelegate.REMOVED )
+ return unpubIcon;
+ return pubIcon;
+ }
+ if( type.equals(PublisherEventLogger.FILE_COPPIED_EVENT))
+ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
+ if( type.equals(PublisherEventLogger.FILE_DELETED_EVENT) || type.equals(PublisherEventLogger.FOLDER_DELETED_EVENT))
+ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
return null;
}
+ protected String getKindDeltaKind(EventLogTreeItem item) {
+ int kind = ((Integer)item.getProperty(PublisherEventLogger.MODULE_KIND)).intValue();
+ int deltaKind = ((Integer)item.getProperty(PublisherEventLogger.DELTA_KIND)).intValue();
+
+ String r = "[";
+ switch(kind) {
+ case IServer.PUBLISH_AUTO: r += "Auto, "; break;
+ case IServer.PUBLISH_CLEAN: r += "Clean, "; break;
+ case IServer.PUBLISH_FULL: r += "Full, "; break;
+ case IServer.PUBLISH_INCREMENTAL: r += "Incremental, "; break;
+ default: r += "Unknown, ";
+ }
+ switch( deltaKind ) {
+ case ServerBehaviourDelegate.ADDED: r += "Added]"; break;
+ case ServerBehaviourDelegate.CHANGED: r += "Changed]"; break;
+ case ServerBehaviourDelegate.REMOVED: r += "Removed]"; break;
+ default: r += "Unknown]";
+ }
+ return r;
+ }
public String getText(EventLogTreeItem item) {
String type = item.getSpecificType();
- if( type.equals(PackagesPublisher.REMOVE_TOP_EVENT))
- return "Removing Module: " + item.getProperty(IJBossServerPublisher.MODULE_NAME);
- else if( type.equals(PackagesPublisher.REMOVE_PACKAGE_SUCCESS))
- return "Deleted Package: " + item.getProperty(PackagesPublisher.PackagesPublisherRemoveEvent.PACKAGE_NAME);
- else if( type.equals(PackagesPublisher.REMOVE_PACKAGE_FAIL))
- return "Failed to Delete Package: " + item.getProperty(PackagesPublisher.PackagesPublisherRemoveEvent.PACKAGE_NAME);
- else if( type.equals(PackagesPublisher.REMOVE_PACKAGE_SKIPPED))
- return "Deletion Skipped: " + item.getProperty(PackagesPublisher.PackagesPublisherRemoveEvent.PACKAGE_NAME);
-
-
- else if( type.equals(PackagesPublisher.PUBLISH_TOP_EVENT))
- return "Publishing Module: " + item.getProperty(IJBossServerPublisher.MODULE_NAME);
- else if( type.equals(PackagesPublisher.PROJECT_BUILD_EVENT))
- return "Building Project: " + item.getProperty(PackagesPublisher.PackagesPublisherRemoveEvent.PACKAGE_NAME);
- else if( type.equals(PackagesPublisher.MOVE_PACKAGE_SUCCESS))
- return "Package Published: " + item.getProperty(PackagesPublisher.PackagesPublisherMoveEvent.PACKAGE_NAME);
- else if( type.equals(PackagesPublisher.MOVE_PACKAGE_FAIL))
- return "File Copy Failed: " + item.getProperty(PackagesPublisher.PackagesPublisherMoveEvent.PACKAGE_NAME);
- else if( type.equals(PackagesPublisher.MOVE_PACKAGE_SKIP))
- return "File Copy Skipped: " + item.getProperty(PackagesPublisher.PackagesPublisherMoveEvent.PACKAGE_NAME);
- return item.toString();
+ if( type.equals(PublisherEventLogger.SINGLE_MODULE_TOP_EVENT)) {
+ return getKindDeltaKind(item) + " " + item.getProperty(PublisherEventLogger.MODULE_NAME);
+ }
+ if( type.equals(PublisherEventLogger.FILE_COPPIED_EVENT)) {
+ return "File Copy: " + new Path((String)item.getProperty(PublisherEventLogger.SOURCE_PROPERTY)).lastSegment();
+ }
+ if( type.equals(PublisherEventLogger.FILE_DELETED_EVENT)) {
+ return "File Delete: " + new Path((String)item.getProperty(PublisherEventLogger.DEST_PROPERTY)).lastSegment();
+ }
+
+ return item.getSpecificType();
}
}
1.3 +5 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/ComplexEventLogLabelProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ComplexEventLogLabelProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/ComplexEventLogLabelProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ComplexEventLogLabelProvider.java 11 Jan 2007 15:50:47 -0000 1.2
+++ ComplexEventLogLabelProvider.java 19 Mar 2007 22:49:39 -0000 1.3
@@ -38,6 +38,7 @@
*/
public abstract class ComplexEventLogLabelProvider
extends LabelProvider implements IEventLogLabelProvider {
+ protected static String DELIMITER = "::";
protected ArrayList supported;
protected HashMap propertyToMessageMap;
@@ -51,10 +52,12 @@
protected abstract void loadPropertyMap();
public boolean supports(String type) {
+ supported.clear(); addSupportedTypes();
return supported.contains(type);
}
public Properties getProperties(EventLogTreeItem item) {
+ loadPropertyMap();
Properties p = new Properties();
HashMap map = item.getProperties();
Object key = null;
@@ -68,7 +71,7 @@
p.put(keyString, valueString);
} else {
keyString = propertyToMessageMap.get(key) == null ? (String)key : propertyToMessageMap.get(key).toString();
- valueStringKey = key + "::" + toString2(map.get(key));
+ valueStringKey = key + DELIMITER + toString2(map.get(key));
valueString = propertyToMessageMap.get(valueStringKey) == null ? toString2(map.get(key)) : toString2(propertyToMessageMap.get(valueStringKey));
p.put(keyString, valueString);
}
More information about the jboss-cvs-commits
mailing list