Attachment #32726 for bug #102390

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




	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 {

Lines 185-195 Link Here

(-)src/com/ibm/etools/symptom/editor/internal/util/messages.properties (-5 / +4 lines)
185	_185 = IBM WebSphere Application Server, Version 6	185	_185 = IBM WebSphere Application Server, Version 6
186	_186 = IBM WebSphere Application Server Network Deployment, Version 5	186	_186 = IBM WebSphere Application Server Network Deployment, Version 5
187		187
188		188	_187 = Sort in ascending order by Creation Time
189		189	_188 = Sort in descending order by Creation Time
190		190	_189 = Descending
191		191	_190 = The time the symptom instance generated by the current rule is created.
192
193		192
194		193
195		194

Lines 26-29 Link Here

(-)src/com/ibm/etools/symptom/editor/internal/util/SymptomEditorConstants.java (+4 lines)
26	public static final String SDB_FILE_NAME_KEY = "sdb_file_name";	26	public static final String SDB_FILE_NAME_KEY = "sdb_file_name";
27		27
28	public static final int PAGE_SIZE = 100;	28	public static final int PAGE_SIZE = 100;
		29
		30	public static final String SORT_ORDER = "Descending";
		31
		32
29	}	33	}

Lines 45-50 Link Here

(-)plugin.properties (+1 lines)
45	_UI_RecommendedAction_type_feature = T&ype	45	_UI_RecommendedAction_type_feature = T&ype
46	_UI_RecommendedAction_version_feature = &Version	46	_UI_RecommendedAction_version_feature = &Version
47	_UI_SimpleMatchPattern_expirationTime_feature = &Expiration Time	47	_UI_SimpleMatchPattern_expirationTime_feature = &Expiration Time
		48	_UI_AnalysisMatchPattern_creationTime_feature = &Creation Time
48	_UI_SimpleMatchPattern_name_feature = &Name	49	_UI_SimpleMatchPattern_name_feature = &Name
49	_UI_SimpleMatchPattern_priority_feature = &Priority	50	_UI_SimpleMatchPattern_priority_feature = &Priority
50	_UI_SimpleMatchPattern_probability_feature = Pr&obability	51	_UI_SimpleMatchPattern_probability_feature = Pr&obability





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;

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 {

	private SymptomAnalysisPage _currentPage = null;
	private String _title = SymptomEditPlugin.INSTANCE.getString("15");
	private boolean _initializedMenu = false;
	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)
	 */

		
		// Create the default page.
		_defaultPage = createDefaultPage(_book);

		addViewPage(null);
	}


		tbm.removeAll();
		getViewSite().getActionBars().updateActionBars();
	}

	
	public void makeActions(){
		if (isInitializedMenu())
			return;
		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;
				

		_gotoPage.setToolTipText(STR_GO_TO_PAGE);

		IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager();
		tbm.add(_sort);
		tbm.add(_pageUp);
		tbm.add(_pageDown);
		tbm.add(_gotoPage);

		}
	}
	
	public Action getSortAction(){
		return _sort;
	}
	

	public Action getPageUpAction(){
		return _pageUp;
	}

	public Action getGotoPageAction(){
		return _gotoPage;
	}
	

//	/////////////////
//	public void fakeData(){

Lines 30-35 Link Here

(-)src/com/ibm/etools/symptom/presentation/SymptomEditorDetailsFactory.java (-1 / +7 lines)
30	protected SimpleMatchPatternDetails simpleMatchPatternDetails;	30	protected SimpleMatchPatternDetails simpleMatchPatternDetails;
31	protected RecommendedActionDetails recommendedActionsDetails;	31	protected RecommendedActionDetails recommendedActionsDetails;
32	protected SymptomEditor editor;	32	protected SymptomEditor editor;
		33	protected AnalysisMatchPatternDetails analysisMatchPatternDetails;
33		34
34	public KTypeContainerDetails createKTypeContainerDetails(){	35	public KTypeContainerDetails createKTypeContainerDetails(){
35	if(kTypeContainerDetails==null)	36	if(kTypeContainerDetails==null)
Lines 45-51 Link Here
45		46
46	public SimpleMatchPatternDetails createSimpleMatchPatternDetails(){	47	public SimpleMatchPatternDetails createSimpleMatchPatternDetails(){
47	if(simpleMatchPatternDetails==null){	48	if(simpleMatchPatternDetails==null){
48	simpleMatchPatternDetails = new SimpleMatchPatternDetails(editor);	49	if ((analysisMatchPatternDetails== null)&&(editor == null)){
		50	analysisMatchPatternDetails = new AnalysisMatchPatternDetails(editor);
		51	simpleMatchPatternDetails=analysisMatchPatternDetails;
		52	}
		53	else
		54	simpleMatchPatternDetails = new SimpleMatchPatternDetails(editor);
49	}	55	}
50	return simpleMatchPatternDetails;	56	return simpleMatchPatternDetails;
51	}	57	}

Lines 10-23 Link Here

(-)src/com/ibm/etools/symptom/presentation/SymptomAnalysisTreeContentProvider.java (-1 / +60 lines)
10	package com.ibm.etools.symptom.presentation;	10	package com.ibm.etools.symptom.presentation;
11		11
12	import java.util.ArrayList;	12	import java.util.ArrayList;
		13	import java.util.Comparator;
		14	import java.util.GregorianCalendar;
13	import java.util.List;	15	import java.util.List;
		16	import java.util.Collections;
		17	import org.eclipse.hyades.models.symptom.impl.SymptomDescriptionImpl;
14	import org.eclipse.jface.viewers.ITreeContentProvider;	18	import org.eclipse.jface.viewers.ITreeContentProvider;
15	import org.eclipse.jface.viewers.Viewer;	19	import org.eclipse.jface.viewers.Viewer;
16	import com.ibm.etools.symptom.editor.SymptomEditPlugin;	20	import com.ibm.etools.symptom.editor.SymptomEditPlugin;
		21	import com.ibm.etools.symptom.editor.internal.SymptomEditorPluginImages;
17	import com.ibm.etools.symptom.editor.internal.util.SymptomEditMessages;	22	import com.ibm.etools.symptom.editor.internal.util.SymptomEditMessages;
18
19	import org.eclipse.osgi.util.NLS;	23	import org.eclipse.osgi.util.NLS;
20		24
		25
21	public class SymptomAnalysisTreeContentProvider implements ITreeContentProvider {	26	public class SymptomAnalysisTreeContentProvider implements ITreeContentProvider {
22	private SymptomAnalysisPage _container;	27	private SymptomAnalysisPage _container;
23	private List _allElements = new ArrayList();	28	private List _allElements = new ArrayList();
Lines 82-87 Link Here
82	return (getChildren(element).length > 0);	87	return (getChildren(element).length > 0);
83	}	88	}
84		89
		90	private long getSymptomDescriptionCreationTime(SymptomDescriptionImpl item) {
		91	String creationTime = item.getCreationTime().toString();
		92	return( new GregorianCalendar(Integer
		93	.parseInt(creationTime.substring(0, 4)), Integer
		94	.parseInt(creationTime.substring(5, 7)), Integer
		95	.parseInt(creationTime.substring(8, 10)), Integer
		96	.parseInt(creationTime.substring(11, 13)), Integer
		97	.parseInt(creationTime.substring(14, 16)), Integer
		98	.parseInt(creationTime.substring(17))).getTimeInMillis());
		99	}
		100
		101	/**
		102	* Sorts the items in the TreeViewer based on the sortOrder passed as argument and update the sort button
		103	* @param sortOrder
		104	* @return
		105	*/
		106	public String sortTreeViewer(String sortOrder) {
		107	if (sortOrder.equalsIgnoreCase("Descending")) {
		108	List sortedList = _allElements;
		109	Collections.sort(sortedList, new Comparator() {
		110	public int compare(Object o1, Object o2) {
		111	return (getSymptomDescriptionCreationTime((SymptomDescriptionImpl)o1) > getSymptomDescriptionCreationTime((SymptomDescriptionImpl) o2))? -1:1;
		112	}
		113	});
		114	//update the sort button
		115	SymptomEditorPluginImages.setImageDescriptors(_container.getSymptomAnalysisViewer().getSortAction(),
		116	SymptomEditorPluginImages.T_LCL,
		117	SymptomEditorPluginImages.IMG_SORT_ASC);
		118	_container.getSymptomAnalysisViewer().getSortAction().setDescription(SymptomEditMessages._187);
		119	_container.getSymptomAnalysisViewer().getSortAction().setToolTipText(SymptomEditMessages._187);
		120	sortOrder="Ascending";
		121	} else if (sortOrder.equalsIgnoreCase("Ascending")){
		122	List sortedList = _allElements;
		123	Collections.sort(sortedList, new Comparator() {
		124	public int compare(Object o1, Object o2) {
		125	return (getSymptomDescriptionCreationTime((SymptomDescriptionImpl)o1) < getSymptomDescriptionCreationTime((SymptomDescriptionImpl) o2))? -1:1;
		126	}
		127	});
		128	//update the sort button
		129	SymptomEditorPluginImages.setImageDescriptors(_container.getSymptomAnalysisViewer().getSortAction(),
		130	SymptomEditorPluginImages.T_LCL,
		131	SymptomEditorPluginImages.IMG_SORT_DSC);
		132	_container.getSymptomAnalysisViewer().getSortAction().setDescription(SymptomEditMessages._188);
		133	_container.getSymptomAnalysisViewer().getSortAction().setToolTipText(SymptomEditMessages._188);
		134	sortOrder="Descending";
		135	}
		136	return sortOrder;
		137	}
		138
		139	public boolean sort(){
		140	return _allElements.size() > 1;
		141	}
		142
85	public boolean pageUp(){	143	public boolean pageUp(){
86	if (_currentPage > 0){	144	if (_currentPage > 0){
87	_currentPage--;	145	_currentPage--;
Lines 138-143 Link Here
138		196
139	private void updatePageActions(){	197	private void updatePageActions(){
140	try{	198	try{
		199	_container.getSymptomAnalysisViewer().getSortAction().setEnabled(_allElements.size() > 1);
141	_container.getSymptomAnalysisViewer().getPageUpAction().setEnabled(_currentPage > 0);	200	_container.getSymptomAnalysisViewer().getPageUpAction().setEnabled(_currentPage > 0);
142	_container.getSymptomAnalysisViewer().getPageDownAction().setEnabled((_totalPages - _currentPage) > 1);	201	_container.getSymptomAnalysisViewer().getPageDownAction().setEnabled((_totalPages - _currentPage) > 1);
143	_container.getSymptomAnalysisViewer().getGotoPageAction().setEnabled(_totalPages > 1);	202	_container.getSymptomAnalysisViewer().getGotoPageAction().setEnabled(_totalPages > 1);

Added Link Here

(-)icons/full/dlcl16/sortrecords_ac.gif (+3 lines)
1	GIF89a÷ûûüúúûùùúøøùÃÅÊÎÐÔÊÌÐÇÉÍ®°òóõñòôðñóÕ×ÚÒÔ×÷øùõö÷ôõö®¯°ÂÁÁüüüÿÿÿ!ù,@)(¡ Á%ð aC
2	)D(@@J@QÂ\Ð ''¨P2¡bÊl)1?Í6'LXp'A+²LH0 ¦G.àôAT¥8pu)zJH U?YD í¨Ó§[
3	;

Added Link Here

(-)icons/full/elcl16/sortrecords_ac.gif (+4 lines)
1	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'<& &=*=%
2	B->#±?)@"¡£¥@(:ÅÆ:.;º¤
3	;+7!ØØ×7$9Î¥84êëê4B5»5B10dl 0?Blz1HÈ
4	1£aÃ-jÜ((;

Added Link Here

(-)icons/full/clcl16/sortrecords_dc.gif (+3 lines)
1	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
2	oÐ@`!>È Ç?ª(c4Ø`Cà?<L$0! fÍIÔ?Á@uL1?£H?ÒÈb @
3	J?Õ«V!À%"@xà`?8DX²f¸bàoË*ø°C ?9,ä5kÀkp[¡C 5pzå¨BfÌÊy`@;




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();
	}
}

Added Link Here

(-)icons/full/dlcl16/sortrecords_dc.gif (+5 lines)
1	GIF89a÷ûûüúúûùùúøøùÃÅÊÎÐÔÊÌÐÇÉÍ®°òóõñòôðñóÕ×ÚÒÔ×÷øùõö÷ôõö®¯°ÂÁÁüüüÿÿÿ!ù,@\|)(¡ Á%ð aC#¤ A3*¤Hp??
2
3	.Ø¸" ''¨@ bÊl0?Í6i8°'Á@YRD@2 @gÅ£I
4	púªRB°ºÓQ
5	°§±$Kú\+0 ;

Added Link Here

(-)icons/full/elcl16/sortrecords_dc.gif (+3 lines)
1	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
2	oÐ@`!>È Ç?ª(c4Ø`Cà?<L$0! fÍIÔ?Á@uL1?£H?ÒÈb @
3	J?Õ«V!À%"@xà`?8DX²f¸bàoË*ø°C ?9,ä5kÀkp[¡C 5pzå¨BfÌÊy`@;

Added Link Here

(-)icons/full/clcl16/sortrecords_ac.gif (+4 lines)
1	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'<& &=*=%
2	B->#±?)@"¡£¥@(:ÅÆ:.;º¤
3	;+7!ØØ×7$9Î¥84êëê4B5»5B10dl 0?Blz1HÈ
4	1£aÃ-jÜ((;

Return to bug 102390

Lines 195-219 Link Here

(-)src/com/ibm/etools/symptom/editor/internal/util/SymptomEditMessages.java (-19 / +4 lines)
195	public static String _185;	195	public static String _185;
196	public static String _186;	196	public static String _186;
197		197
198		198	public static String _187;
199		199	public static String _188;
200		200	public static String _189;
201		201	public static String _190;
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217		202
218		203
219	static {	204	static {

Lines 26-31 Link Here

(-)src/com/ibm/etools/symptom/presentation/SymptomAnalysisDetailPageBook.java (-3 / +6 lines)
26	import org.eclipse.hyades.models.plugin.ModelsPlugin;	26	import org.eclipse.hyades.models.plugin.ModelsPlugin;
27	import org.eclipse.hyades.models.symptom.CommonBaseEventKType;	27	import org.eclipse.hyades.models.symptom.CommonBaseEventKType;
28	import org.eclipse.hyades.models.symptom.SymptomDescription;	28	import org.eclipse.hyades.models.symptom.SymptomDescription;
		29	import org.eclipse.hyades.models.symptom.impl.SimpleMatchPatternImpl;
29	import org.eclipse.hyades.trace.ui.HyadesUtil;	30	import org.eclipse.hyades.trace.ui.HyadesUtil;
30	import org.eclipse.hyades.trace.ui.IViewSelectionChangedListener;	31	import org.eclipse.hyades.trace.ui.IViewSelectionChangedListener;
31	import org.eclipse.hyades.trace.ui.UIPlugin;	32	import org.eclipse.hyades.trace.ui.UIPlugin;
Lines 315-323 Link Here
315	_symptomInfoViewer.show();	316	_symptomInfoViewer.show();
316	_symptomInfoTreeViewer.setInput(((SymptomDescription) obj)	317	_symptomInfoTreeViewer.setInput(((SymptomDescription) obj)
317	.getSymptomDefinitionRef().getKTypeChildren());	318	.getSymptomDefinitionRef().getKTypeChildren());
318	IDetailsPage page = getDetailsFor(obj);	319	IDetailsPage page = getDetailsFor(obj);
319	page.setFormInput(((SymptomDescription) obj)	320	((SimpleMatchPatternImpl)(((SymptomDescription) obj).getSymptomDefinitionRef())).setCreationTime(((SymptomDescription)obj).getCreationTime());
320	.getSymptomDefinitionRef());	321	page.setFormInput(((SymptomDescription)obj)
		322	.getSymptomDefinitionRef());
		323
321	// _symptomDescViewer.setFormInput(((SymptomDescription) obj)	324	// _symptomDescViewer.setFormInput(((SymptomDescription) obj)
322	// .getSymptomDefinitionRef());	325	// .getSymptomDefinitionRef());
323	}	326	}

Lines 56-61 Link Here

(-)src/com/ibm/etools/symptom/editor/internal/SymptomEditorPluginImages.java (+4 lines)
56		56
57	public static final String IMG_HORIZONTAL = "th_horizontal.gif";	57	public static final String IMG_HORIZONTAL = "th_horizontal.gif";
58	public static final String IMG_VERTICAL = "th_vertical.gif";	58	public static final String IMG_VERTICAL = "th_vertical.gif";
		59	public static final String IMG_SORT_ASC = "sortrecords_ac.gif";
		60	public static final String IMG_SORT_DSC = "sortrecords_dc.gif";
59	public static final String IMG_PG_UP = "pageup.gif";	61	public static final String IMG_PG_UP = "pageup.gif";
60	public static final String IMG_PG_DOWN = "pagedown.gif";	62	public static final String IMG_PG_DOWN = "pagedown.gif";
61	public static final String IMG_PG_GOTO = "gotopage.gif";	63	public static final String IMG_PG_GOTO = "gotopage.gif";
Lines 72-77 Link Here
72	public static final ImageDescriptor DESC_VERTICAL_DISABLED = createManaged(T_DLCL, IMG_VERTICAL); //$NON-NLS-1$	74	public static final ImageDescriptor DESC_VERTICAL_DISABLED = createManaged(T_DLCL, IMG_VERTICAL); //$NON-NLS-1$
73	public static final ImageDescriptor DESC_OPEN_LOG_VIEW = createManaged(T_TOOL, IMG_OPEN_LOG_VIEW); //$NON-NLS-1$	75	public static final ImageDescriptor DESC_OPEN_LOG_VIEW = createManaged(T_TOOL, IMG_OPEN_LOG_VIEW); //$NON-NLS-1$
74		76
		77	public static final ImageDescriptor DESC_SORT_ASC = createManaged(T_ELCL, IMG_SORT_ASC); //$NON-NLS-1$
		78	public static final ImageDescriptor DESC_SORT_DSC = createManaged(T_ELCL, IMG_SORT_DSC); //$NON-NLS-1$
75	public static final ImageDescriptor DESC_PG_UP = createManaged(T_ELCL, IMG_PG_UP); //$NON-NLS-1$	79	public static final ImageDescriptor DESC_PG_UP = createManaged(T_ELCL, IMG_PG_UP); //$NON-NLS-1$
76	public static final ImageDescriptor DESC_PG_DOWN = createManaged(T_ELCL, IMG_PG_DOWN); //$NON-NLS-1$	80	public static final ImageDescriptor DESC_PG_DOWN = createManaged(T_ELCL, IMG_PG_DOWN); //$NON-NLS-1$
77	public static final ImageDescriptor DESC_PG_GOTO= createManaged(T_ELCL, IMG_PG_GOTO); //$NON-NLS-1$	81	public static final ImageDescriptor DESC_PG_GOTO= createManaged(T_ELCL, IMG_PG_GOTO); //$NON-NLS-1$

Added Link Here

(-)src/com/ibm/etools/symptom/presentation/AnalysisMatchPatternDetails.java (+195 lines)
1	package com.ibm.etools.symptom.presentation;
2
3	import java.text.DateFormat;
4	import java.text.SimpleDateFormat;
5	import java.util.GregorianCalendar;
6	import java.util.Date;
7	import org.eclipse.hyades.models.symptom.SimpleMatchPattern;
8	import org.eclipse.swt.SWT;
9	import org.eclipse.swt.custom.CCombo;
10	import org.eclipse.swt.layout.GridData;
11	import org.eclipse.swt.layout.GridLayout;
12	import org.eclipse.swt.widgets.Composite;
13	import org.eclipse.swt.widgets.Label;
14	import org.eclipse.swt.widgets.Text;
15	import org.eclipse.ui.forms.events.ExpansionAdapter;
16	import org.eclipse.ui.forms.events.ExpansionEvent;
17	import org.eclipse.ui.forms.widgets.Section;
18	import com.ibm.etools.symptom.editor.SymptomEditPlugin;
19	import com.ibm.etools.symptom.editor.internal.util.GridUtil;
20	import com.ibm.etools.symptom.editor.internal.util.SymptomEditMessages;
21
22	public class AnalysisMatchPatternDetails extends SimpleMatchPatternDetails {
23	protected Text creationTime;
24	protected final int CREATION_TIME_ID = 8;
25
26	public AnalysisMatchPatternDetails(SymptomEditor analysisEditor){
27	super(analysisEditor);
28	}
29
30	public void createClientArea() {
31	//match pattern properties section
32
33	Section matchPatternSection = toolkit.createSection(client,
34	Section.DESCRIPTION\|Section.TWISTIE\|Section.EXPANDED);
35	GridLayout detailsLayout = new GridLayout();
36	detailsLayout.marginWidth = detailsLayout.marginHeight = 2;
37	matchPatternSection.setLayout(detailsLayout);
38	GridData data = GridUtil.createFill();
39	data.horizontalSpan = 2;
40	matchPatternSection.setLayoutData(data);
41	matchPatternSection.addExpansionListener(new ExpansionAdapter() {
42	public void expansionStateChanged(ExpansionEvent e) {
43	client.layout();
44	}
45	});
46	matchPatternSection.setText(SymptomEditMessages._108);
47	toolkit.createCompositeSeparator(matchPatternSection);
48	matchPatternSection.setDescription(SymptomEditMessages._107);
49
50	Composite sectionClient = toolkit.createComposite(matchPatternSection);
51	detailsLayout = new GridLayout();
52	detailsLayout.marginWidth = detailsLayout.marginHeight = 2;
53	detailsLayout.numColumns = 2;
54	sectionClient.setLayout(detailsLayout);
55	data = GridUtil.createFill();
56	sectionClient.setLayoutData(data);
57	matchPatternSection.setClient(sectionClient);
58
59	Label l = toolkit.createLabel(sectionClient, getString("_UI_SimpleMatchPattern_name_feature")+":", SWT.WRAP);
60	name = toolkit.createText(sectionClient, "", SWT.NONE);
61	name.setData(new Integer(NAME_ID));
62	setLayout(l,name);
63	name.setToolTipText(SymptomEditMessages._159);
64
65	l = toolkit.createLabel(sectionClient, getString("_UI_SimpleMatchPattern_value_feature")+":", SWT.WRAP);
66	value = toolkit.createText(sectionClient, "", SWT.MULTI \| SWT.H_SCROLL \| SWT.V_SCROLL);
67	value.setData(new Integer(VALUE_ID));
68	setLayout(l,value);
69	value.setToolTipText(SymptomEditMessages._164);
70
71	l = toolkit.createLabel(sectionClient, getString("_UI_KnowledgeType_knowledgeCategory_feature")+":", SWT.WRAP);
72	knowledgeCategory = toolkit.createText(sectionClient, "", SWT.NONE);
73	knowledgeCategory.setData(new Integer(KNOWLEDGE_CAT_ID));
74	setLayout(l,knowledgeCategory);
75	knowledgeCategory.setToolTipText(SymptomEditMessages._142);
76
77	l = toolkit.createLabel(sectionClient, getString("_UI_KnowledgeType_knowledgeScope_feature")+":", SWT.WRAP);
78	knowledgeScope = toolkit.createText(sectionClient, "", SWT.NONE);
79	knowledgeScope.setData(new Integer(KNOWLEDGE_SCOPE_ID));
80	setLayout(l,knowledgeScope);
81	knowledgeScope.setToolTipText(SymptomEditMessages._143);
82
83	toolkit.paintBordersFor(sectionClient);
84
85	//createSpace(toolkit,client,2);
86
87	//symptom properties section
88	Section symptomInfoSection = toolkit.createSection(client,
89	Section.DESCRIPTION\|Section.TWISTIE\|Section.EXPANDED);
90	detailsLayout = new GridLayout();
91	detailsLayout.marginWidth = detailsLayout.marginHeight = 2;
92	symptomInfoSection.setLayout(detailsLayout);
93	data = GridUtil.createFill();
94	data.horizontalSpan = 2;
95	symptomInfoSection.setLayoutData(data);
96	symptomInfoSection.addExpansionListener(new ExpansionAdapter() {
97	public void expansionStateChanged(ExpansionEvent e) {
98	client.layout();
99	}
100	});
101	symptomInfoSection.setText(SymptomEditMessages._176);
102	toolkit.createCompositeSeparator(symptomInfoSection);
103	symptomInfoSection.setDescription(SymptomEditMessages._175);
104
105	Composite symptomSectionClient = toolkit.createComposite(symptomInfoSection);
106	detailsLayout = new GridLayout();
107	detailsLayout.marginWidth = detailsLayout.marginHeight = 2;
108	detailsLayout.numColumns = 2;
109	symptomSectionClient.setLayout(detailsLayout);
110	data = GridUtil.createFill();
111	symptomSectionClient.setLayoutData(data);
112	symptomInfoSection.setClient(symptomSectionClient);
113
114	l = toolkit.createLabel(symptomSectionClient,SymptomEditPlugin.INSTANCE.getString("_UI_AnalysisMatchPattern_creationTime_feature")+":", SWT.WRAP);
115	creationTime = toolkit.createText(symptomSectionClient, "", SWT.NONE);
116	creationTime.setData(new Integer(CREATION_TIME_ID));
117	setLayout(l,creationTime);
118	creationTime.setToolTipText(SymptomEditMessages._190);
119
120	l = toolkit.createLabel(symptomSectionClient, SymptomEditPlugin.INSTANCE.getString("_UI_SimpleMatchPattern_expirationTime_feature")+":", SWT.WRAP);
121	expirationTime = toolkit.createText(symptomSectionClient, "", SWT.NONE);
122	expirationTime.setData(new Integer(EXPIRATION_TIME_ID));
123	setLayout(l,expirationTime);
124	expirationTime.setToolTipText(SymptomEditMessages._158);
125
126	l = toolkit.createLabel(symptomSectionClient, getString("_UI_SimpleMatchPattern_priority_feature")+":", SWT.WRAP);
127	priority = toolkit.createText(symptomSectionClient, "", SWT.NONE);
128	priority.setData(new Integer(PRIORITY_ID));
129	setLayout(l,priority);
130	priority.setToolTipText(SymptomEditMessages._160);
131
132	l = toolkit.createLabel(symptomSectionClient, getString("_UI_SimpleMatchPattern_probability_feature")+":", SWT.WRAP);
133	probability = toolkit.createText(symptomSectionClient, "", SWT.NONE);
134	probability.setData(new Integer(PROBABILITY_ID));
135	setLayout(l,probability);
136	probability.setToolTipText(SymptomEditMessages._161);
137
138	l = toolkit.createLabel(symptomSectionClient, getString("_UI_KnowledgeType_state_feature")+":", SWT.WRAP);
139	state = new CCombo(symptomSectionClient, SWT.FLAT);
140	toolkit.adapt(state,false,false);
141	state.setData(new Integer(STATE_ID));
142	setLayout(l,state);
143	state.setToolTipText(SymptomEditMessages._162);
144
145	l = toolkit.createLabel(symptomSectionClient, getString("_UI_SimpleMatchPattern_symptomType_feature")+":", SWT.WRAP);
146	type = toolkit.createText(symptomSectionClient, "", SWT.NONE);
147	type.setData(new Integer(TYPE_ID));
148	setLayout(l,type);
149	type.setToolTipText(SymptomEditMessages._163);
150
151	// l = toolkit.createLabel(symptomSectionClient, getString("_UI_SimpleMatchPattern_version_feature")+":", SWT.WRAP);
152	// version = toolkit.createText(symptomSectionClient, "", SWT.NONE);
153	// version.setEditable(true);
154	// version.setData(new Integer(VERSION_ID));
155	// version.addModifyListener(this);
156	// setLayout(l,version);
157	// version.setToolTipText(SymptomEditMessages._165);
158
159	name.addModifyListener(this);
160	value.addModifyListener(this);
161	knowledgeCategory.addModifyListener(this);
162	knowledgeScope.addModifyListener(this);
163	expirationTime.addModifyListener(this);
164	priority.addModifyListener(this);
165	probability.addModifyListener(this);
166	state.addSelectionListener(this);
167	type.addModifyListener(this);
168
169	toolkit.paintBordersFor(symptomSectionClient);
170
171	}
172
173	private long getSymptomDescriptionCreationTime(String creationTime) {
174	return( new GregorianCalendar(Integer
175	.parseInt(creationTime.substring(0, 4)), Integer
176	.parseInt(creationTime.substring(5, 7)), Integer
177	.parseInt(creationTime.substring(8, 10)), Integer
178	.parseInt(creationTime.substring(11, 13)), Integer
179	.parseInt(creationTime.substring(14, 16)), Integer
180	.parseInt(creationTime.substring(17))).getTimeInMillis());
181	}
182
183	public void refresh(){
184	if(!(eObject instanceof SimpleMatchPattern))
185	return;
186	refresh = true;
187	if(((SimpleMatchPattern) eObject).getCreationTime() != null){
188	DateFormat dateFormat = new SimpleDateFormat("MMM dd, yyyy hh:mm:ss");
189	Date date = new Date(getSymptomDescriptionCreationTime(((SimpleMatchPattern) eObject).getCreationTime().toString()));
190	creationTime.setText(dateFormat.format(date));
191	}
192	refresh = false;
193	super.refresh();
194	}
195	}