[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders ...

[Robert Stryker]

  User: rawb    
  Date: 06/08/09 15:27:07

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders 
                        EventLogViewProvider.java
  Log:
  UI and Core changes to allow for non-JMX-enabled servers to be 'started' even when I can't verify it. 
  
  Revision  Changes    Path
  1.7       +20 -3     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/EventLogViewProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EventLogViewProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/EventLogViewProvider.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- EventLogViewProvider.java	27 Jul 2006 06:34:00 -0000	1.6
  +++ EventLogViewProvider.java	9 Aug 2006 19:27:07 -0000	1.7
  @@ -122,6 +122,10 @@
   					String ret = "Server action canceled.";
   					return ret;
   				}
  +				if( event.getEventType() == StateCheckerLogEvent.SERVER_STATE_CHANGE_TIMEOUT) {
  +					String ret = "Server Timeout Reached.";
  +					return ret;
  +				}
   			}
   			
   			if( obj instanceof ConsoleLogEvent) {
  @@ -148,7 +152,13 @@
   			if( obj instanceof ProcessLogEvent ) {
   				ProcessLogEvent event = ((ProcessLogEvent)obj);
   				SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd hh:mm:ss.S");
  -				return event.toString() + "   " + format.format(new Date(event.getDate()));
  +				String eventToString;
  +				if( event.getEventType() == ProcessLogEvent.UNKNOWN ) {
  +					eventToString = "Unknown Event";
  +				} else {
  +					eventToString = event.toString();
  +				}
  +				return eventToString + "   " + format.format(new Date(event.getDate()));
   			}
   			return obj.toString();
   		}
  @@ -181,7 +191,9 @@
   				if( scle.getCurrentState() == StateCheckerLogEvent.SERVER_STATE_CHANGE_CANCELED) {
   					return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);					
   				}
  -				
  +				if( event.getEventType() == StateCheckerLogEvent.SERVER_STATE_CHANGE_TIMEOUT) {
  +					return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);					
  +				}
   			}
   			if( obj instanceof ConsoleLogEvent ) {
   				return JBossServerUISharedImages.getImage(JBossServerUISharedImages.CONSOLE_IMAGE);
  @@ -203,6 +215,12 @@
   			if( obj instanceof TwiddleLogEvent ) {
   				return JBossServerUISharedImages.getImage(JBossServerUISharedImages.TWIDDLE_IMAGE);
   			}
  +
  +			if( event.getEventType() == ProcessLogEvent.UNKNOWN ) {
  +				return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
  +			}
  +
  +			
   			} catch( Exception e ) {
   				e.printStackTrace();
   				ProcessLogEvent event = (ProcessLogEvent)obj;
  @@ -211,7 +229,6 @@
   			}
   
   
  -			
   			return null;
   		}