Attachment #34423 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 symptom creation time
189		189	_188 = Sort in descending order by symptom 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 48-53 Link Here

(-)plugin.properties (+1 lines)
48	_UI_RecommendedAction_type_feature = T&ype	48	_UI_RecommendedAction_type_feature = T&ype
49	_UI_RecommendedAction_version_feature = &Version	49	_UI_RecommendedAction_version_feature = &Version
50	_UI_SimpleMatchPattern_expirationTime_feature = &Expiration Time	50	_UI_SimpleMatchPattern_expirationTime_feature = &Expiration Time
		51	_UI_AnalysisMatchPattern_creationTime_feature = &Creation Time
51	_UI_SimpleMatchPattern_name_feature = &Name	52	_UI_SimpleMatchPattern_name_feature = &Name
52	_UI_SimpleMatchPattern_priority_feature = &Priority	53	_UI_SimpleMatchPattern_priority_feature = &Priority
53	_UI_SimpleMatchPattern_probability_feature = Pr&obability	54	_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 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 (+1 lines)
1	GIF89a¢ÁÆÙ«ÖëLZ]O[[ÿÿÿ!ù,)HºÜM¸×¸TrûÜÊ?i??Ü_©º'Ü4me5Ã:<þÀE;

Added Link Here

(-)icons/full/clcl16/sortrecords_dc.gif (+2 lines)
1	GIF89a¢ÁÆÙ«ÖëLZ]O[[ÿÿÿ!ù,+HºÜ>
2	¸¸TrûÜJ?i??ù#ª>ì7C]//c39#Ì£ p;

Added Link Here

(-)icons/full/elcl16/sortrecords_ac.gif (+1 lines)
1	GIF89a¢ÁÆÙ«ÖëLZ]O[[ÿÿÿ!ù,)HºÜM¸×¸TrûÜÊ?i??Ü_©º'Ü4me5Ã:<þÀE;

Added Link Here

(-)icons/full/dlcl16/sortrecords_dc.gif (+2 lines)
1	GIF89a¢ÁÆÙ«ÖëLZ]O[[ÿÿÿ!ù,+HºÜ>
2	¸¸TrûÜJ?i??ù#ª>ì7C]//c39#Ì£ p;

Added Link Here

(-)icons/full/elcl16/sortrecords_dc.gif (+2 lines)
1	GIF89a¢ÁÆÙ«ÖëLZ]O[[ÿÿÿ!ù,+HºÜ>
2	¸¸TrûÜJ?i??ù#ª>ì7C]//c39#Ì£ p;

Added Link Here

(-)icons/full/clcl16/sortrecords_ac.gif (+1 lines)
1	GIF89a¢ÁÆÙ«ÖëLZ]O[[ÿÿÿ!ù,)HºÜM¸×¸TrûÜÊ?i??Ü_©º'Ü4me5Ã:<þÀE;

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 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$