Attachment 32726 Details for Bug 102390 – patch- the right one:)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch- the right one:)

com.ibm.etools.symptom.editor_patch.txt (text/plain), 33.12 KB, created by Valentina Popescu

on 2006-01-09 21:01:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Valentina Popescu

Created: 2006-01-09 21:01:39 EST

Size: 33.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P com.ibm.etools.symptom.editor
>Index: src/com/ibm/etools/symptom/editor/internal/util/SymptomEditMessages.java
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/src/com/ibm/etools/symptom/editor/internal/util/SymptomEditMessages.java,v
>retrieving revision 1.2
>diff -u -r1.2 SymptomEditMessages.java
>--- src/com/ibm/etools/symptom/editor/internal/util/SymptomEditMessages.java	29 Nov 2005 20:33:47 -0000	1.2
>+++ src/com/ibm/etools/symptom/editor/internal/util/SymptomEditMessages.java	13 Dec 2005 15:07:15 -0000
>@@ -195,25 +195,10 @@
> 	public static String _185;
> 	public static String _186;
> 	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>-	
>+	public static String _187;
>+	public static String _188;
>+	public static String _189;
>+	public static String _190;
> 	
> 	
> 	static {
>Index: src/com/ibm/etools/symptom/editor/internal/util/messages.properties
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/src/com/ibm/etools/symptom/editor/internal/util/messages.properties,v
>retrieving revision 1.2
>diff -u -r1.2 messages.properties
>--- src/com/ibm/etools/symptom/editor/internal/util/messages.properties	29 Nov 2005 20:33:47 -0000	1.2
>+++ src/com/ibm/etools/symptom/editor/internal/util/messages.properties	13 Dec 2005 15:07:15 -0000
>@@ -185,11 +185,10 @@
> _185                   = IBM WebSphere Application Server, Version 6
> _186                   = IBM WebSphere Application Server Network Deployment, Version 5
> 
>-
>-
>-
>-
>-
>+_187 = Sort in ascending order by Creation Time
>+_188 = Sort in descending order by Creation Time
>+_189 = Descending
>+_190 = The time the symptom instance generated by the current rule is created.
> 
> 
> 
>Index: src/com/ibm/etools/symptom/editor/internal/util/SymptomEditorConstants.java
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/src/com/ibm/etools/symptom/editor/internal/util/SymptomEditorConstants.java,v
>retrieving revision 1.8
>diff -u -r1.8 SymptomEditorConstants.java
>--- src/com/ibm/etools/symptom/editor/internal/util/SymptomEditorConstants.java	1 Jul 2005 02:02:08 -0000	1.8
>+++ src/com/ibm/etools/symptom/editor/internal/util/SymptomEditorConstants.java	13 Dec 2005 15:07:15 -0000
>@@ -26,4 +26,8 @@
> 	public static final String SDB_FILE_NAME_KEY = "sdb_file_name";
> 	
> 	public static final int PAGE_SIZE = 100;
>+	
>+	public static final String SORT_ORDER = "Descending";
>+	
>+
> }
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/plugin.properties,v
>retrieving revision 1.37
>diff -u -r1.37 plugin.properties
>--- plugin.properties	29 Nov 2005 20:33:47 -0000	1.37
>+++ plugin.properties	13 Dec 2005 15:07:15 -0000
>@@ -45,6 +45,7 @@
> _UI_RecommendedAction_type_feature = T&ype
> _UI_RecommendedAction_version_feature = &Version
> _UI_SimpleMatchPattern_expirationTime_feature = &Expiration Time
>+_UI_AnalysisMatchPattern_creationTime_feature = &Creation Time
> _UI_SimpleMatchPattern_name_feature = &Name
> _UI_SimpleMatchPattern_priority_feature = &Priority
> _UI_SimpleMatchPattern_probability_feature = Pr&obability
>Index: src/com/ibm/etools/symptom/presentation/SymptomAnalysisDetailPageBook.java
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/src/com/ibm/etools/symptom/presentation/SymptomAnalysisDetailPageBook.java,v
>retrieving revision 1.16
>diff -u -r1.16 SymptomAnalysisDetailPageBook.java
>--- src/com/ibm/etools/symptom/presentation/SymptomAnalysisDetailPageBook.java	2 Dec 2005 00:33:00 -0000	1.16
>+++ src/com/ibm/etools/symptom/presentation/SymptomAnalysisDetailPageBook.java	13 Dec 2005 15:07:15 -0000
>@@ -26,6 +26,7 @@
> import org.eclipse.hyades.models.plugin.ModelsPlugin;
> import org.eclipse.hyades.models.symptom.CommonBaseEventKType;
> import org.eclipse.hyades.models.symptom.SymptomDescription;
>+import org.eclipse.hyades.models.symptom.impl.SimpleMatchPatternImpl;
> import org.eclipse.hyades.trace.ui.HyadesUtil;
> import org.eclipse.hyades.trace.ui.IViewSelectionChangedListener;
> import org.eclipse.hyades.trace.ui.UIPlugin;
>@@ -315,9 +316,11 @@
> 			_symptomInfoViewer.show();
> 			_symptomInfoTreeViewer.setInput(((SymptomDescription) obj)
> 					.getSymptomDefinitionRef().getKTypeChildren());
>-			IDetailsPage page = getDetailsFor(obj);			
>-			page.setFormInput(((SymptomDescription) obj)
>-					.getSymptomDefinitionRef());			
>+			IDetailsPage page = getDetailsFor(obj);		
>+			((SimpleMatchPatternImpl)(((SymptomDescription) obj).getSymptomDefinitionRef())).setCreationTime(((SymptomDescription)obj).getCreationTime());
>+			page.setFormInput(((SymptomDescription)obj)
>+					.getSymptomDefinitionRef());	
>+			
> //			_symptomDescViewer.setFormInput(((SymptomDescription) obj)
> //					.getSymptomDefinitionRef());
> 		}
>Index: src/com/ibm/etools/symptom/presentation/SymptomAnalysisViewer.java
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/src/com/ibm/etools/symptom/presentation/SymptomAnalysisViewer.java,v
>retrieving revision 1.6
>diff -u -r1.6 SymptomAnalysisViewer.java
>--- src/com/ibm/etools/symptom/presentation/SymptomAnalysisViewer.java	29 Nov 2005 20:33:47 -0000	1.6
>+++ src/com/ibm/etools/symptom/presentation/SymptomAnalysisViewer.java	13 Dec 2005 15:07:16 -0000
>@@ -10,6 +10,7 @@
> 
> package com.ibm.etools.symptom.presentation;
> 
>+import org.eclipse.core.runtime.Preferences;
> import org.eclipse.jface.action.Action;
> import org.eclipse.jface.action.IToolBarManager;
> import org.eclipse.jface.dialogs.IInputValidator;
>@@ -30,6 +31,7 @@
> import com.ibm.etools.symptom.editor.internal.SymptomEditorPluginImages;
> import com.ibm.etools.symptom.editor.internal.util.GridUtil;
> import com.ibm.etools.symptom.editor.internal.util.SymptomEditMessages;
>+import com.ibm.etools.symptom.editor.internal.util.SymptomEditorConstants;
> import org.eclipse.osgi.util.NLS;
> 
> public class SymptomAnalysisViewer extends ViewPart {
>@@ -38,9 +40,8 @@
> 	private SymptomAnalysisPage _currentPage = null;
> 	private String _title = SymptomEditPlugin.INSTANCE.getString("15");
> 	private boolean _initializedMenu = false;
>-	private Action _pageUp, _pageDown, _gotoPage;
>-
>-
>+	private Action _sort, _pageUp, _pageDown, _gotoPage;
>+	private String STR_SORT_ORDER;
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
> 	 */
>@@ -50,7 +51,7 @@
> 		
> 		// Create the default page.
> 		_defaultPage = createDefaultPage(_book);
>-		
>+
> 		addViewPage(null);
> 	}
> 
>@@ -121,15 +122,55 @@
> 		tbm.removeAll();
> 		getViewSite().getActionBars().updateActionBars();
> 	}
>+
> 	
> 	public void makeActions(){
> 		if (isInitializedMenu())
> 			return;
>-		
>-		initializedMenu(true);
>+		initializedMenu(true);		 
>+
>+		STR_SORT_ORDER = SymptomEditPlugin.getPlugin().getPreferenceStore().getString(
>+				SymptomEditorConstants.SORT_ORDER); 
>+		if ((STR_SORT_ORDER == null) || (STR_SORT_ORDER.equals("")))
>+					STR_SORT_ORDER=SymptomEditMessages._189; 
>+		_sort = new Action(STR_SORT_ORDER) {
>+			public void run() {
>+				if (_currentPage == null || !(_currentPage instanceof SymptomAnalysisPage))
>+					return;				
>+				BusyIndicator.showWhile(null, new Runnable() {
>+					public void run() {
>+						SymptomAnalysisTreeContentProvider provider = (SymptomAnalysisTreeContentProvider) ((SymptomAnalysisPage) _currentPage).getTreeViewer().getContentProvider();
>+						_sort.setEnabled(provider.sort());
>+						STR_SORT_ORDER = provider.sortTreeViewer(STR_SORT_ORDER);
>+						((SymptomAnalysisPage) _currentPage).update();
>+						Preferences store = SymptomEditPlugin.getPlugin().getPluginPreferences();
>+						store.setValue(SymptomEditorConstants.SORT_ORDER, STR_SORT_ORDER);
>+					}
>+				});
>+			}
>+		};
>+		getViewSite().getActionBars().setGlobalActionHandler(ActionFactory.PREVIOUS.getId(), _sort);
>+		if (STR_SORT_ORDER.equalsIgnoreCase("Descending")){		
>+			SymptomEditorPluginImages.setImageDescriptors(_sort,
>+					SymptomEditorPluginImages.T_LCL,
>+					SymptomEditorPluginImages.IMG_SORT_DSC);
>+			_sort.setDescription(SymptomEditMessages._188);
>+			_sort.setToolTipText(SymptomEditMessages._188);
>+		}
>+		else if (STR_SORT_ORDER.equalsIgnoreCase("Ascending")){
>+			SymptomEditorPluginImages.setImageDescriptors(_sort,
>+					SymptomEditorPluginImages.T_LCL,
>+					SymptomEditorPluginImages.IMG_SORT_ASC);
>+			_sort.setDescription(SymptomEditMessages._187);
>+			_sort.setToolTipText(SymptomEditMessages._187);
>+			
>+		}	
>+			
> 		String STR_PAGE_UP = SymptomEditMessages._123;
> 		_pageUp = new Action(STR_PAGE_UP) {
> 			public void run() {
>+				
>+				
> 				if (_currentPage == null || !(_currentPage instanceof SymptomAnalysisPage))
> 					return;
> 				
>@@ -221,6 +262,7 @@
> 		_gotoPage.setToolTipText(STR_GO_TO_PAGE);
> 
> 		IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager();
>+		tbm.add(_sort);
> 		tbm.add(_pageUp);
> 		tbm.add(_pageDown);
> 		tbm.add(_gotoPage);
>@@ -255,6 +297,11 @@
> 		}
> 	}
> 	
>+	public Action getSortAction(){
>+		return _sort;
>+	}
>+	
>+
> 	public Action getPageUpAction(){
> 		return _pageUp;
> 	}
>@@ -266,6 +313,7 @@
> 	public Action getGotoPageAction(){
> 		return _gotoPage;
> 	}
>+	
> 
> //	/////////////////
> //	public void fakeData(){
>Index: src/com/ibm/etools/symptom/presentation/SymptomEditorDetailsFactory.java
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/src/com/ibm/etools/symptom/presentation/SymptomEditorDetailsFactory.java,v
>retrieving revision 1.10
>diff -u -r1.10 SymptomEditorDetailsFactory.java
>--- src/com/ibm/etools/symptom/presentation/SymptomEditorDetailsFactory.java	18 Nov 2005 21:06:23 -0000	1.10
>+++ src/com/ibm/etools/symptom/presentation/SymptomEditorDetailsFactory.java	13 Dec 2005 15:07:16 -0000
>@@ -30,6 +30,7 @@
> 	protected SimpleMatchPatternDetails simpleMatchPatternDetails;	
> 	protected RecommendedActionDetails recommendedActionsDetails;
> 	protected SymptomEditor editor;
>+	protected AnalysisMatchPatternDetails analysisMatchPatternDetails;
> 	
> 	public KTypeContainerDetails createKTypeContainerDetails(){
> 		if(kTypeContainerDetails==null)
>@@ -45,7 +46,12 @@
> 	
> 	public SimpleMatchPatternDetails createSimpleMatchPatternDetails(){
> 		if(simpleMatchPatternDetails==null){
>-			simpleMatchPatternDetails = new SimpleMatchPatternDetails(editor);
>+			if ((analysisMatchPatternDetails== null)&&(editor == null)){
>+				analysisMatchPatternDetails = new AnalysisMatchPatternDetails(editor);
>+				simpleMatchPatternDetails=analysisMatchPatternDetails;
>+			}
>+			else
>+				simpleMatchPatternDetails = new SimpleMatchPatternDetails(editor);
> 		}		
> 		return simpleMatchPatternDetails;
> 	}
>Index: src/com/ibm/etools/symptom/presentation/SymptomAnalysisTreeContentProvider.java
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/src/com/ibm/etools/symptom/presentation/SymptomAnalysisTreeContentProvider.java,v
>retrieving revision 1.4
>diff -u -r1.4 SymptomAnalysisTreeContentProvider.java
>--- src/com/ibm/etools/symptom/presentation/SymptomAnalysisTreeContentProvider.java	29 Nov 2005 20:33:47 -0000	1.4
>+++ src/com/ibm/etools/symptom/presentation/SymptomAnalysisTreeContentProvider.java	13 Dec 2005 15:07:15 -0000
>@@ -10,14 +10,19 @@
> package com.ibm.etools.symptom.presentation;
> 
> import java.util.ArrayList;
>+import java.util.Comparator;
>+import java.util.GregorianCalendar;
> import java.util.List;
>+import java.util.Collections;
>+import org.eclipse.hyades.models.symptom.impl.SymptomDescriptionImpl;
> import org.eclipse.jface.viewers.ITreeContentProvider;
> import org.eclipse.jface.viewers.Viewer;
> import com.ibm.etools.symptom.editor.SymptomEditPlugin;
>+import com.ibm.etools.symptom.editor.internal.SymptomEditorPluginImages;
> import com.ibm.etools.symptom.editor.internal.util.SymptomEditMessages;
>-
> import org.eclipse.osgi.util.NLS;
> 
>+
> public class SymptomAnalysisTreeContentProvider implements ITreeContentProvider {
> 	private SymptomAnalysisPage _container;
> 	private List _allElements = new ArrayList();
>@@ -82,6 +87,59 @@
> 		return (getChildren(element).length > 0);
> 	}
> 
>+	private long getSymptomDescriptionCreationTime(SymptomDescriptionImpl item) {
>+		String creationTime = item.getCreationTime().toString();
>+		return( new GregorianCalendar(Integer
>+				.parseInt(creationTime.substring(0, 4)), Integer
>+				.parseInt(creationTime.substring(5, 7)), Integer
>+				.parseInt(creationTime.substring(8, 10)), Integer
>+				.parseInt(creationTime.substring(11, 13)), Integer
>+				.parseInt(creationTime.substring(14, 16)), Integer
>+				.parseInt(creationTime.substring(17))).getTimeInMillis());
>+	}
>+
>+	/**
>+	 * Sorts the items in the TreeViewer based on the sortOrder passed as argument and update the sort button
>+	 * @param sortOrder
>+	 * @return
>+	 */
>+	public String  sortTreeViewer(String sortOrder) {
>+		if (sortOrder.equalsIgnoreCase("Descending")) {
>+			List sortedList = _allElements;
>+			Collections.sort(sortedList, new Comparator() {
>+				public int compare(Object o1, Object o2) {
>+					return (getSymptomDescriptionCreationTime((SymptomDescriptionImpl)o1) > getSymptomDescriptionCreationTime((SymptomDescriptionImpl) o2))? -1:1;
>+				}
>+			});
>+			//update the sort button
>+			SymptomEditorPluginImages.setImageDescriptors(_container.getSymptomAnalysisViewer().getSortAction(),
>+					SymptomEditorPluginImages.T_LCL,
>+					SymptomEditorPluginImages.IMG_SORT_ASC);
>+			_container.getSymptomAnalysisViewer().getSortAction().setDescription(SymptomEditMessages._187);
>+			_container.getSymptomAnalysisViewer().getSortAction().setToolTipText(SymptomEditMessages._187);
>+			sortOrder="Ascending";
>+		} else if (sortOrder.equalsIgnoreCase("Ascending")){
>+			List sortedList = _allElements;
>+			Collections.sort(sortedList, new Comparator() {
>+				public int compare(Object o1, Object o2) {
>+					return (getSymptomDescriptionCreationTime((SymptomDescriptionImpl)o1) < getSymptomDescriptionCreationTime((SymptomDescriptionImpl) o2))? -1:1;
>+				}
>+			});
>+			//update the sort button
>+			SymptomEditorPluginImages.setImageDescriptors(_container.getSymptomAnalysisViewer().getSortAction(),
>+						SymptomEditorPluginImages.T_LCL,
>+						SymptomEditorPluginImages.IMG_SORT_DSC);
>+			_container.getSymptomAnalysisViewer().getSortAction().setDescription(SymptomEditMessages._188);
>+			_container.getSymptomAnalysisViewer().getSortAction().setToolTipText(SymptomEditMessages._188);
>+			sortOrder="Descending";
>+		}		
>+		return sortOrder;
>+	}
>+
>+	public boolean sort(){
>+		return _allElements.size() > 1; 
>+	}
>+
> 	public boolean pageUp(){
> 		if (_currentPage > 0){
> 			_currentPage--;
>@@ -138,6 +196,7 @@
> 	
> 	private void updatePageActions(){
> 		try{
>+			_container.getSymptomAnalysisViewer().getSortAction().setEnabled(_allElements.size() > 1);
> 			_container.getSymptomAnalysisViewer().getPageUpAction().setEnabled(_currentPage > 0);
> 			_container.getSymptomAnalysisViewer().getPageDownAction().setEnabled((_totalPages - _currentPage) > 1);
> 			_container.getSymptomAnalysisViewer().getGotoPageAction().setEnabled(_totalPages > 1);
>Index: src/com/ibm/etools/symptom/editor/internal/SymptomEditorPluginImages.java
>===================================================================
>RCS file: /cvsroot/ac-tech/com.ibm.etools.symptom.editor/src/com/ibm/etools/symptom/editor/internal/SymptomEditorPluginImages.java,v
>retrieving revision 1.9
>diff -u -r1.9 SymptomEditorPluginImages.java
>--- src/com/ibm/etools/symptom/editor/internal/SymptomEditorPluginImages.java	6 May 2005 04:07:34 -0000	1.9
>+++ src/com/ibm/etools/symptom/editor/internal/SymptomEditorPluginImages.java	13 Dec 2005 15:07:15 -0000
>@@ -56,6 +56,8 @@
> 
> 	public static final String IMG_HORIZONTAL =  "th_horizontal.gif";
> 	public static final String IMG_VERTICAL =  "th_vertical.gif";
>+	public static final String IMG_SORT_ASC =  "sortrecords_ac.gif";
>+	public static final String IMG_SORT_DSC =  "sortrecords_dc.gif";
> 	public static final String IMG_PG_UP =  "pageup.gif";
> 	public static final String IMG_PG_DOWN =  "pagedown.gif";
> 	public static final String IMG_PG_GOTO = "gotopage.gif";
>@@ -72,6 +74,8 @@
> 	public static final ImageDescriptor DESC_VERTICAL_DISABLED = createManaged(T_DLCL, IMG_VERTICAL); //$NON-NLS-1$
> 	public static final ImageDescriptor DESC_OPEN_LOG_VIEW = createManaged(T_TOOL, IMG_OPEN_LOG_VIEW); //$NON-NLS-1$
> 
>+	public static final ImageDescriptor DESC_SORT_ASC = createManaged(T_ELCL, IMG_SORT_ASC); //$NON-NLS-1$
>+	public static final ImageDescriptor DESC_SORT_DSC = createManaged(T_ELCL, IMG_SORT_DSC); //$NON-NLS-1$
> 	public static final ImageDescriptor DESC_PG_UP = createManaged(T_ELCL, IMG_PG_UP); //$NON-NLS-1$
> 	public static final ImageDescriptor DESC_PG_DOWN = createManaged(T_ELCL, IMG_PG_DOWN); //$NON-NLS-1$
> 	public static final ImageDescriptor DESC_PG_GOTO= createManaged(T_ELCL, IMG_PG_GOTO); //$NON-NLS-1$
>Index: icons/full/dlcl16/sortrecords_ac.gif
>===================================================================
>RCS file: icons/full/dlcl16/sortrecords_ac.gif
>diff -N icons/full/dlcl16/sortrecords_ac.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/full/dlcl16/sortrecords_ac.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,3 @@
>+GIF89a÷ûûüúúûùùúøøùÃÅÊÎÐÔÊÌÐÇÉÍ®°òóõñòôðñóÕ×ÚÒÔ×÷øùõö÷ôõö®¯°ÂÁÁüüüÿÿÿ!ù,@)(¡ Á%ð aC
>+)D(@@J@QÂ\Ð 	''¨P2¡bÊl)1?Í6'LXp'A+²LH0 ¦G.àôAT¥8pu)zJH U?YD	í¨Ó§[
>+;
>Index: icons/full/elcl16/sortrecords_ac.gif
>===================================================================
>RCS file: icons/full/elcl16/sortrecords_ac.gif
>diff -N icons/full/elcl16/sortrecords_ac.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/full/elcl16/sortrecords_ac.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,4 @@
>+GIF89aæuu?óõûøùüovpvqwîòúòõûùúüøùû¾Âðôû?Ã¦Æ¬Ë¢³Ï¨¸ÓnvÞèøÝç÷ßè÷äìùçîùíòúóöûovÜç÷ßéøÞè÷áêøêðùöøûæîùðõûòöûe}õøû÷ùûV·T´U²V±]¦M?¿T²T°NY_M[\M[[~uN{sOzLwMtNH?}J}J?EF°?>¬@§B§B¢C´?=ÿÿÿ!ùB,¢BA,?A'<&	&=*=%
>+ B->#±?)@"¡£¥@(:ÅÆ:.;º¤
>+;+7!ØØ×7$9Î¥84êëê4B5»5B10dl 0?Blz1HÈ
>+1£aÃ-jÜ((;
>Index: icons/full/clcl16/sortrecords_dc.gif
>===================================================================
>RCS file: icons/full/clcl16/sortrecords_dc.gif
>diff -N icons/full/clcl16/sortrecords_dc.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/full/clcl16/sortrecords_dc.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,3 @@
>+GIF89a÷uu?óõûøùüovpvqwîòúòõûùúüøùû¾Âðôû?Ã¦Æ¬Ë¢³Ï¨¸ÓnvÞèøÝç÷ßè÷äìùçîùíòúóöûovÜç÷ßéøÞè÷áêøêðùöøûæîùðõûòöûe}õøû÷ùûV·T´U²V±]¦M?¿T²T°NY_M[\M[[~uN{sOzLwMtNH?}J}J?EF°?>¬@§B§B¢C´?=ÿÿÿ!ùB,@³¤ Á]¼âC
>+oÐ@`!>È Ç?ª(c4Ø`Cà?<L$0! fÍIÔ?Á@uL1?£H?ÒÈb @
>+J?Õ«V!À%"@xà`?8DX²f¸bàoË*ø°C ?9,ä5kÀkp[¡C	5pzå¨BfÌÊy`@;
>Index: src/com/ibm/etools/symptom/presentation/AnalysisMatchPatternDetails.java
>===================================================================
>RCS file: src/com/ibm/etools/symptom/presentation/AnalysisMatchPatternDetails.java
>diff -N src/com/ibm/etools/symptom/presentation/AnalysisMatchPatternDetails.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/com/ibm/etools/symptom/presentation/AnalysisMatchPatternDetails.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,195 @@
>+package com.ibm.etools.symptom.presentation;
>+
>+import java.text.DateFormat;
>+import java.text.SimpleDateFormat;
>+import java.util.GregorianCalendar;
>+import java.util.Date;
>+import org.eclipse.hyades.models.symptom.SimpleMatchPattern;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.custom.CCombo;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Label;
>+import org.eclipse.swt.widgets.Text;
>+import org.eclipse.ui.forms.events.ExpansionAdapter;
>+import org.eclipse.ui.forms.events.ExpansionEvent;
>+import org.eclipse.ui.forms.widgets.Section;
>+import com.ibm.etools.symptom.editor.SymptomEditPlugin;
>+import com.ibm.etools.symptom.editor.internal.util.GridUtil;
>+import com.ibm.etools.symptom.editor.internal.util.SymptomEditMessages;
>+
>+public class AnalysisMatchPatternDetails extends SimpleMatchPatternDetails {
>+	protected Text creationTime;
>+	protected final int CREATION_TIME_ID = 8;
>+	
>+	public AnalysisMatchPatternDetails(SymptomEditor analysisEditor){
>+		super(analysisEditor);
>+	}
>+	
>+	public void createClientArea() {
>+		//match pattern properties section
>+		
>+		Section matchPatternSection = toolkit.createSection(client, 
>+				Section.DESCRIPTION|Section.TWISTIE|Section.EXPANDED);
>+		GridLayout detailsLayout = new GridLayout();
>+		detailsLayout.marginWidth = detailsLayout.marginHeight = 2;		
>+		matchPatternSection.setLayout(detailsLayout);
>+		GridData data = GridUtil.createFill();
>+		data.horizontalSpan = 2;
>+		matchPatternSection.setLayoutData(data);
>+		matchPatternSection.addExpansionListener(new ExpansionAdapter() {
>+			public void expansionStateChanged(ExpansionEvent e) {
>+				client.layout();
>+			}
>+		});
>+		matchPatternSection.setText(SymptomEditMessages._108);
>+		toolkit.createCompositeSeparator(matchPatternSection);
>+		matchPatternSection.setDescription(SymptomEditMessages._107);
>+		
>+		Composite sectionClient = toolkit.createComposite(matchPatternSection);
>+		detailsLayout = new GridLayout();
>+		detailsLayout.marginWidth = detailsLayout.marginHeight = 2;
>+		detailsLayout.numColumns = 2;		
>+		sectionClient.setLayout(detailsLayout);
>+		data = GridUtil.createFill();		
>+		sectionClient.setLayoutData(data);		
>+		matchPatternSection.setClient(sectionClient);		
>+			
>+		Label l = toolkit.createLabel(sectionClient, getString("_UI_SimpleMatchPattern_name_feature")+":", SWT.WRAP);		
>+		name = toolkit.createText(sectionClient, "", SWT.NONE);		
>+		name.setData(new Integer(NAME_ID));	
>+		setLayout(l,name);
>+		name.setToolTipText(SymptomEditMessages._159);
>+		
>+		l = toolkit.createLabel(sectionClient, getString("_UI_SimpleMatchPattern_value_feature")+":", SWT.WRAP);
>+		value = toolkit.createText(sectionClient, "", SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);		
>+		value.setData(new Integer(VALUE_ID));
>+		setLayout(l,value);
>+		value.setToolTipText(SymptomEditMessages._164);
>+		
>+		l = toolkit.createLabel(sectionClient, getString("_UI_KnowledgeType_knowledgeCategory_feature")+":", SWT.WRAP);
>+		knowledgeCategory = toolkit.createText(sectionClient, "", SWT.NONE);		
>+		knowledgeCategory.setData(new Integer(KNOWLEDGE_CAT_ID));
>+		setLayout(l,knowledgeCategory);
>+		knowledgeCategory.setToolTipText(SymptomEditMessages._142);
>+		
>+		l = toolkit.createLabel(sectionClient, getString("_UI_KnowledgeType_knowledgeScope_feature")+":", SWT.WRAP);
>+		knowledgeScope = toolkit.createText(sectionClient, "", SWT.NONE);		
>+		knowledgeScope.setData(new Integer(KNOWLEDGE_SCOPE_ID));
>+		setLayout(l,knowledgeScope);
>+		knowledgeScope.setToolTipText(SymptomEditMessages._143);
>+		
>+		toolkit.paintBordersFor(sectionClient);
>+
>+		//createSpace(toolkit,client,2);
>+		
>+		//symptom properties section
>+		Section symptomInfoSection = toolkit.createSection(client, 
>+				Section.DESCRIPTION|Section.TWISTIE|Section.EXPANDED);
>+		detailsLayout = new GridLayout();
>+		detailsLayout.marginWidth = detailsLayout.marginHeight = 2;		
>+		symptomInfoSection.setLayout(detailsLayout);
>+		data = GridUtil.createFill();
>+		data.horizontalSpan = 2;
>+		symptomInfoSection.setLayoutData(data);		
>+		symptomInfoSection.addExpansionListener(new ExpansionAdapter() {
>+			public void expansionStateChanged(ExpansionEvent e) {
>+				client.layout();
>+			}
>+		});
>+		symptomInfoSection.setText(SymptomEditMessages._176);
>+		toolkit.createCompositeSeparator(symptomInfoSection);
>+		symptomInfoSection.setDescription(SymptomEditMessages._175);
>+		
>+		Composite symptomSectionClient = toolkit.createComposite(symptomInfoSection);
>+		detailsLayout = new GridLayout();
>+		detailsLayout.marginWidth = detailsLayout.marginHeight = 2;
>+		detailsLayout.numColumns = 2;		
>+		symptomSectionClient.setLayout(detailsLayout);
>+		data = GridUtil.createFill();		
>+		symptomSectionClient.setLayoutData(data);		
>+		symptomInfoSection.setClient(symptomSectionClient);		
>+
>+		l = toolkit.createLabel(symptomSectionClient,SymptomEditPlugin.INSTANCE.getString("_UI_AnalysisMatchPattern_creationTime_feature")+":", SWT.WRAP);		
>+		creationTime = toolkit.createText(symptomSectionClient, "", SWT.NONE);		
>+		creationTime.setData(new Integer(CREATION_TIME_ID));
>+		setLayout(l,creationTime);
>+		creationTime.setToolTipText(SymptomEditMessages._190);
>+
>+		l = toolkit.createLabel(symptomSectionClient, SymptomEditPlugin.INSTANCE.getString("_UI_SimpleMatchPattern_expirationTime_feature")+":", SWT.WRAP);		
>+		expirationTime = toolkit.createText(symptomSectionClient, "", SWT.NONE);		
>+		expirationTime.setData(new Integer(EXPIRATION_TIME_ID));
>+		setLayout(l,expirationTime);
>+		expirationTime.setToolTipText(SymptomEditMessages._158);
>+
>+		l = toolkit.createLabel(symptomSectionClient, getString("_UI_SimpleMatchPattern_priority_feature")+":", SWT.WRAP);
>+		priority = toolkit.createText(symptomSectionClient, "", SWT.NONE);		
>+		priority.setData(new Integer(PRIORITY_ID));		
>+		setLayout(l,priority);
>+		priority.setToolTipText(SymptomEditMessages._160);
>+
>+		l = toolkit.createLabel(symptomSectionClient, getString("_UI_SimpleMatchPattern_probability_feature")+":", SWT.WRAP);
>+		probability = toolkit.createText(symptomSectionClient, "", SWT.NONE);		
>+		probability.setData(new Integer(PROBABILITY_ID));		
>+		setLayout(l,probability);
>+		probability.setToolTipText(SymptomEditMessages._161);
>+
>+		l = toolkit.createLabel(symptomSectionClient, getString("_UI_KnowledgeType_state_feature")+":", SWT.WRAP);
>+		state = new CCombo(symptomSectionClient, SWT.FLAT);
>+		toolkit.adapt(state,false,false);		
>+		state.setData(new Integer(STATE_ID));
>+		setLayout(l,state);		
>+		state.setToolTipText(SymptomEditMessages._162);
>+		
>+		l = toolkit.createLabel(symptomSectionClient, getString("_UI_SimpleMatchPattern_symptomType_feature")+":", SWT.WRAP);		
>+		type = toolkit.createText(symptomSectionClient, "", SWT.NONE);
>+		type.setData(new Integer(TYPE_ID));	
>+		setLayout(l,type);
>+		type.setToolTipText(SymptomEditMessages._163);
>+		
>+//		l = toolkit.createLabel(symptomSectionClient, getString("_UI_SimpleMatchPattern_version_feature")+":", SWT.WRAP);		
>+//		version = toolkit.createText(symptomSectionClient, "", SWT.NONE);
>+//		version.setEditable(true);
>+//		version.setData(new Integer(VERSION_ID));	
>+//		version.addModifyListener(this);
>+//		setLayout(l,version);
>+//		version.setToolTipText(SymptomEditMessages._165);
>+
>+		name.addModifyListener(this);
>+		value.addModifyListener(this);
>+		knowledgeCategory.addModifyListener(this);
>+		knowledgeScope.addModifyListener(this);
>+		expirationTime.addModifyListener(this);
>+		priority.addModifyListener(this);
>+		probability.addModifyListener(this);
>+		state.addSelectionListener(this);
>+		type.addModifyListener(this);
>+
>+		toolkit.paintBordersFor(symptomSectionClient);
>+		
>+	}
>+	
>+	private long getSymptomDescriptionCreationTime(String creationTime) {
>+		return( new GregorianCalendar(Integer
>+				.parseInt(creationTime.substring(0, 4)), Integer
>+				.parseInt(creationTime.substring(5, 7)), Integer
>+				.parseInt(creationTime.substring(8, 10)), Integer
>+				.parseInt(creationTime.substring(11, 13)), Integer
>+				.parseInt(creationTime.substring(14, 16)), Integer
>+				.parseInt(creationTime.substring(17))).getTimeInMillis());
>+	}
>+	
>+	public void refresh(){
>+		if(!(eObject instanceof SimpleMatchPattern))
>+			return;		
>+		refresh = true;
>+		if(((SimpleMatchPattern) eObject).getCreationTime()  != null){
>+			DateFormat dateFormat = new SimpleDateFormat("MMM dd, yyyy hh:mm:ss");	
>+			Date date = new Date(getSymptomDescriptionCreationTime(((SimpleMatchPattern) eObject).getCreationTime().toString()));
>+			creationTime.setText(dateFormat.format(date));			
>+		}
>+		refresh = false;	
>+		super.refresh();
>+	}
>+}
>Index: icons/full/dlcl16/sortrecords_dc.gif
>===================================================================
>RCS file: icons/full/dlcl16/sortrecords_dc.gif
>diff -N icons/full/dlcl16/sortrecords_dc.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/full/dlcl16/sortrecords_dc.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,5 @@
>+GIF89a÷ûûüúúûùùúøøùÃÅÊÎÐÔÊÌÐÇÉÍ®°òóõñòôðñóÕ×ÚÒÔ×÷øùõö÷ôõö®¯°ÂÁÁüüüÿÿÿ!ù,@|)(¡ Á%ð aC#¤ A3*¤Hp??
>+
>+.Ø¸"	''¨@ bÊl0?Í6i8°'Á@YRD@2 @gÅ£I
>+púªRB°ºÓQ
>+°§±$Kú\+0 ;
>Index: icons/full/elcl16/sortrecords_dc.gif
>===================================================================
>RCS file: icons/full/elcl16/sortrecords_dc.gif
>diff -N icons/full/elcl16/sortrecords_dc.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/full/elcl16/sortrecords_dc.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,3 @@
>+GIF89a÷uu?óõûøùüovpvqwîòúòõûùúüøùû¾Âðôû?Ã¦Æ¬Ë¢³Ï¨¸ÓnvÞèøÝç÷ßè÷äìùçîùíòúóöûovÜç÷ßéøÞè÷áêøêðùöøûæîùðõûòöûe}õøû÷ùûV·T´U²V±]¦M?¿T²T°NY_M[\M[[~uN{sOzLwMtNH?}J}J?EF°?>¬@§B§B¢C´?=ÿÿÿ!ùB,@³¤ Á]¼âC
>+oÐ@`!>È Ç?ª(c4Ø`Cà?<L$0! fÍIÔ?Á@uL1?£H?ÒÈb @
>+J?Õ«V!À%"@xà`?8DX²f¸bàoË*ø°C ?9,ä5kÀkp[¡C	5pzå¨BfÌÊy`@;
>Index: icons/full/clcl16/sortrecords_ac.gif
>===================================================================
>RCS file: icons/full/clcl16/sortrecords_ac.gif
>diff -N icons/full/clcl16/sortrecords_ac.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/full/clcl16/sortrecords_ac.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,4 @@
>+GIF89aæuu?óõûøùüovpvqwîòúòõûùúüøùû¾Âðôû?Ã¦Æ¬Ë¢³Ï¨¸ÓnvÞèøÝç÷ßè÷äìùçîùíòúóöûovÜç÷ßéøÞè÷áêøêðùöøûæîùðõûòöûe}õøû÷ùûV·T´U²V±]¦M?¿T²T°NY_M[\M[[~uN{sOzLwMtNH?}J}J?EF°?>¬@§B§B¢C´?=ÿÿÿ!ùB,¢BA,?A'<&	&=*=%
>+ B->#±?)@"¡£¥@(:ÅÆ:.;º¤
>+;+7!ØØ×7$9Î¥84êëê4B5»5B10dl 0?Blz1HÈ
>+1£aÃ-jÜ((;

Actions: View | Diff

Attachments on bug 102390: 32679 | 32726 | 32727 | 34423