[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events ...
Robert Stryker
rawblem at gmail.com
Thu Jan 11 10:50:47 EST 2007
User: rawb
Date: 07/01/11 10:50:47
Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events
PollingLabelProvider.java
PackageBuildLabelProvider.java
PackagesPublishLabelProvider.java
PathPublisherLabelProvider.java
ComplexEventLogLabelProvider.java
Log:
Small api change
Revision Changes Path
1.2 +0 -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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PollingLabelProvider.java 22 Dec 2006 23:26:35 -0000 1.1
+++ PollingLabelProvider.java 11 Jan 2007 15:50:47 -0000 1.2
@@ -64,10 +64,6 @@
supported.add(JBossServerBehavior.FORCE_SHUTDOWN_EVENT_KEY);
}
- public boolean supports(String type) {
- return supported.contains(type);
- }
-
public Image getImage(EventLogTreeItem element) {
if( element.getSpecificType().equals(PollThread.SERVER_STARTING)) return getStartingImage();
if( element.getSpecificType().equals(PollThread.SERVER_STOPPING)) return getStoppingImage();
@@ -168,7 +164,6 @@
*/
protected void loadPropertyMap() {
// property names and their readable forms
- propertyToMessageMap = new HashMap();
propertyToMessageMap.put(EventLogTreeItem.DATE, "Time");
propertyToMessageMap.put(TwiddlePoller.STATUS, "Status");
propertyToMessageMap.put(PollThread.EXPECTED_STATE, "Expected State");
1.2 +37 -21 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackageBuildLabelProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageBuildLabelProvider.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/PackageBuildLabelProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PackageBuildLabelProvider.java 22 Dec 2006 23:26:35 -0000 1.1
+++ PackageBuildLabelProvider.java 11 Jan 2007 15:50:47 -0000 1.2
@@ -21,47 +21,63 @@
*/
package org.jboss.ide.eclipse.as.ui.views.server.providers.events;
-import java.util.ArrayList;
-import java.util.Properties;
+import java.util.HashMap;
-import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
import org.jboss.ide.eclipse.as.core.model.PackagesBuildListener;
import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem;
+import org.jboss.ide.eclipse.as.core.runtime.server.polling.PollThread;
+import org.jboss.ide.eclipse.as.core.runtime.server.polling.TwiddlePoller;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.IEventLogLabelProvider;
/**
*
* @author rob.stryker at jboss.com
*/
-public class PackageBuildLabelProvider extends LabelProvider implements IEventLogLabelProvider {
+public class PackageBuildLabelProvider extends ComplexEventLogLabelProvider implements IEventLogLabelProvider {
public Image getImage(EventLogTreeItem item) {
return null;
}
- public Properties getProperties(EventLogTreeItem item) {
- return null;
- }
-
public String getText(EventLogTreeItem item) {
- if( item.getSpecificType().equals(PackagesBuildListener.PROJECT_BUILD_STARTED)) return "Build Started: " + item.getProperty("project.name");
- if( item.getSpecificType().equals(PackagesBuildListener.PROJECT_BUILD_FINISHED)) return "Build Finished: " + item.getProperty("project.name");
- if( item.getSpecificType().equals(PackagesBuildListener.PACKAGE_BUILD_STARTED)) return "Package Build Started: " + item.getProperty("package.name");
- if( item.getSpecificType().equals(PackagesBuildListener.PACKAGE_BUILD_FINISHED)) return "Package Build Finished: " + item.getProperty("package.name");
- if( item.getSpecificType().equals(PackagesBuildListener.PACKAGE_BUILD_FINISHED)) return "Package Build Failed: " + item.getProperty("package.name");
+ if( item.getSpecificType().equals(PackagesBuildListener.PROJECT_BUILD_STARTED)) return "Build Started";
+ if( item.getSpecificType().equals(PackagesBuildListener.PROJECT_BUILD_FINISHED)) return "Build Finished";
+ if( item.getSpecificType().equals(PackagesBuildListener.PACKAGE_BUILD_STARTED)) return "Package Build Started";
+ if( item.getSpecificType().equals(PackagesBuildListener.PACKAGE_BUILD_FINISHED)) return "Package Build Finished";
+ if( item.getSpecificType().equals(PackagesBuildListener.PACKAGE_BUILD_FINISHED)) return "Package Build Failed";
+ if( item.getSpecificType().equals(PackagesBuildListener.FILESET_FINISHED)) return "Fileset Complete";
+ if( item.getSpecificType().equals(PackagesBuildListener.FILESET_START)) return "Fileset Started";
+
return "";
}
- public boolean supports(String type) {
- ArrayList list = new ArrayList();
- list.add(PackagesBuildListener.PROJECT_BUILD_STARTED);
- list.add(PackagesBuildListener.PROJECT_BUILD_FINISHED);
- list.add(PackagesBuildListener.PACKAGE_BUILD_STARTED);
- list.add(PackagesBuildListener.PACKAGE_BUILD_FINISHED);
- list.add(PackagesBuildListener.PACKAGE_BUILD_FAILED);
- return list.contains(type);
+ protected void addSupportedTypes() {
+ supported.add(PackagesBuildListener.PROJECT_BUILD_STARTED);
+ supported.add(PackagesBuildListener.PROJECT_BUILD_FINISHED);
+ supported.add(PackagesBuildListener.PACKAGE_BUILD_STARTED);
+ supported.add(PackagesBuildListener.PACKAGE_BUILD_FINISHED);
+ supported.add(PackagesBuildListener.PACKAGE_BUILD_FAILED);
+ supported.add(PackagesBuildListener.FILESET_FINISHED);
+ supported.add(PackagesBuildListener.FILESET_START);
+ }
+
+ protected void loadPropertyMap() {
+ // property names and their readable forms
+ propertyToMessageMap.put(EventLogTreeItem.DATE, "Time");
+
+ propertyToMessageMap.put(PackagesBuildListener.PACKAGE_NAME, "Package Name");
+ propertyToMessageMap.put(PackagesBuildListener.PROJECT_NAME, "Project Name");
+
+ propertyToMessageMap.put(PackagesBuildListener.FILESET_DESTINATION_FILENAME, "Destination Filename");
+ propertyToMessageMap.put(PackagesBuildListener.FILESET_EXCLUDES_PATTERN, "Excludes Pattern");
+ propertyToMessageMap.put(PackagesBuildListener.FILESET_FILE_PATH, "File Path");
+ propertyToMessageMap.put(PackagesBuildListener.FILESET_INCLUDES_PATTERN, "Includes Pattern");
+ propertyToMessageMap.put(PackagesBuildListener.FILESET_PROJECT, "Project");
+ propertyToMessageMap.put(PackagesBuildListener.FILESET_SOURCE, "Source Container");
+ propertyToMessageMap.put(PackagesBuildListener.FILESET_SOURCE_FOLDER, "Source Folder");
+ propertyToMessageMap.put(PackagesBuildListener.FILESET_SOURCE_PROJECT, "Source Project");
}
}
1.2 +16 -6 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PackagesPublishLabelProvider.java 8 Jan 2007 19:47:20 -0000 1.1
+++ PackagesPublishLabelProvider.java 11 Jan 2007 15:50:47 -0000 1.2
@@ -11,6 +11,7 @@
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.PackagesPublisher.PackagesPublisherBuildEvent;
+import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.IEventLogLabelProvider;
public class PackagesPublishLabelProvider extends ComplexEventLogLabelProvider implements
@@ -30,7 +31,6 @@
supported.add(PackagesPublisher.MOVE_PACKAGE_SKIP);
}
protected void loadPropertyMap() {
- propertyToMessageMap = new HashMap();
propertyToMessageMap.put(IJBossServerPublisher.MODULE_NAME, "Module Name");
propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.PACKAGE_NAME, "Package Name");
propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.DESTINATION, "Package File");
@@ -39,11 +39,21 @@
propertyToMessageMap.put(PackagesPublisher.PackagesPublisherRemoveEvent.EXCEPTION_MESSAGE, "Exception Message");
}
- public boolean supports(String type) {
- return supported.contains(type);
- }
-
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;
+
return null;
}
@@ -64,7 +74,7 @@
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 "Coppied File: " + item.getProperty(PackagesPublisher.PackagesPublisherMoveEvent.PACKAGE_NAME);
+ 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))
1.2 +7 -5 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PathPublisherLabelProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PathPublisherLabelProvider.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/PathPublisherLabelProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PathPublisherLabelProvider.java 8 Jan 2007 19:47:20 -0000 1.1
+++ PathPublisherLabelProvider.java 11 Jan 2007 15:50:47 -0000 1.2
@@ -29,6 +29,8 @@
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.PathPublisher;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.IEventLogLabelProvider;
/**
@@ -46,7 +48,6 @@
}
protected void loadPropertyMap() {
- propertyToMessageMap = new HashMap();
propertyToMessageMap.put(IJBossServerPublisher.MODULE_NAME, "Module Name");
propertyToMessageMap.put(PathPublisher.SOURCE_FILE, "Source File");
propertyToMessageMap.put(PathPublisher.DEST_FILE, "Destination File");
@@ -55,11 +56,12 @@
propertyToMessageMap.put(PathPublisher.EXCEPTION, "Exception");
}
- public boolean supports(String type) {
- return supported.contains(type);
- }
-
public Image getImage(EventLogTreeItem item) {
+ String type = item.getSpecificType();
+ if( type.equals(PathPublisher.PUBLISH_EVENT))
+ return JBossServerUISharedImages.getImage(JBossServerUISharedImages.PUBLISH_IMAGE);
+ if( type.equals(PathPublisher.UNPUBLISH_EVENT))
+ return JBossServerUISharedImages.getImage(JBossServerUISharedImages.UNPUBLISH_IMAGE);
return null;
}
1.2 +6 -0 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ComplexEventLogLabelProvider.java 22 Dec 2006 23:26:35 -0000 1.1
+++ ComplexEventLogLabelProvider.java 11 Jan 2007 15:50:47 -0000 1.2
@@ -42,12 +42,18 @@
protected ArrayList supported;
protected HashMap propertyToMessageMap;
public ComplexEventLogLabelProvider() {
+ supported = new ArrayList();
+ propertyToMessageMap = new HashMap();
addSupportedTypes();
loadPropertyMap();
}
protected abstract void addSupportedTypes();
protected abstract void loadPropertyMap();
+ public boolean supports(String type) {
+ return supported.contains(type);
+ }
+
public Properties getProperties(EventLogTreeItem item) {
Properties p = new Properties();
HashMap map = item.getProperties();
More information about the jboss-cvs-commits
mailing list