Attachment 91403 Details for Bug 199594 – Proposed Patch

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

[patch] Proposed Patch

199594patch.txt (text/plain), 11.34 KB, created by Ritwik Lodhiya

on 2008-03-03 13:16:47 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ritwik Lodhiya

Created: 2008-03-03 13:16:47 EST

Size: 11.34 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.ui/plugin.xml,v
>retrieving revision 1.44
>diff -u -r1.44 plugin.xml
>--- plugin.xml	7 Dec 2007 04:17:41 -0000	1.44
>+++ plugin.xml	3 Mar 2008 17:11:44 -0000
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> 
> 
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.ui/plugin.properties,v
>retrieving revision 1.47
>diff -u -r1.47 plugin.properties
>--- plugin.properties	23 Mar 2007 04:46:19 -0000	1.47
>+++ plugin.properties	3 Mar 2008 17:11:44 -0000
>@@ -1,5 +1,5 @@
> ############################################################################### 
>-# Copyright (c) 2005, 2007 IBM Corporation and others. 
>+# Copyright (c) 2005, 2008 IBM Corporation and others. 
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -53,3 +53,4 @@
> _43=Profiling and Logging
> _44=Test
> _45= Configure Min Max
>+_46 = Hosts
>\ No newline at end of file
>#P org.eclipse.hyades.trace.ui
>Index: src/org/eclipse/hyades/trace/ui/internal/core/TraceOptionsUI.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/core/TraceOptionsUI.java,v
>retrieving revision 1.16
>diff -u -r1.16 TraceOptionsUI.java
>--- src/org/eclipse/hyades/trace/ui/internal/core/TraceOptionsUI.java	5 Apr 2007 04:17:13 -0000	1.16
>+++ src/org/eclipse/hyades/trace/ui/internal/core/TraceOptionsUI.java	3 Mar 2008 17:11:47 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
>  * All rights reserved.   This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -22,8 +22,6 @@
> import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.preference.PreferencePage;
> import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.ModifyEvent;
>-import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.SelectionListener;
> import org.eclipse.swt.layout.GridData;
>@@ -33,7 +31,6 @@
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Text;
>-import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;
> import org.eclipse.tptp.platform.common.ui.internal.CommonUIPlugin;
> import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceConstants;
> import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITracePlugin;
>@@ -57,7 +54,7 @@
> * CONTEXT_ID tbpp0006 for Local IBM Remote Agent port number entry field in Profiling(Trace) preference page
> */
> 
>-public class TraceOptionsUI implements SelectionListener, ModifyListener
>+public class TraceOptionsUI implements SelectionListener
> {
> 	private Button _enableInfoMsg;
> 	private Button _enableReloadMsg;
>@@ -68,7 +65,6 @@
> 	private Button _neverPersp;
> 	private Button _promptPersp;
> 	private Text _projectName;
>-	private Text _localPort;
>     private PreferencePage _preferencePage;
>     
>     private Button _manualRefreshBtn;
>@@ -118,12 +114,12 @@
> 	data = GridUtil.createHorizontalFill();
> 	_projectName.setLayoutData(data);
> 
>-	Label portdesc = new Label(profilingInfo, SWT.NULL);
>-	portdesc.setText(UIPlugin.getResourceString(TraceMessages.RAC_LHP));
>-	_localPort = new Text(profilingInfo, SWT.BORDER);
>-	data = GridUtil.createHorizontalFill();
>-	_localPort.setLayoutData(data);
>-	_localPort.addModifyListener(this);
>+//	Label portdesc = new Label(profilingInfo, SWT.NULL);
>+//	portdesc.setText(UIPlugin.getResourceString(TraceMessages.RAC_LHP));
>+//	_localPort = new Text(profilingInfo, SWT.BORDER);
>+//	data = GridUtil.createHorizontalFill();
>+//	_localPort.setLayoutData(data);
>+//	_localPort.addModifyListener(this);
> 
> 	_enableInfoMsg = new Button(profilingInfo, SWT.CHECK);
> 	_enableInfoMsg.setText(UIPlugin.getResourceString(TraceMessages.SP_TIP));
>@@ -259,10 +255,6 @@
> 	return _projectName.getText().trim();
> }
> 
>-public String getLocalPortNumber() {
>-	return _localPort.getText().trim();
>-}
>-
> public String getSaveOnExitOption() {
> 	if (_always.getSelection()) {
> 		return MessageDialogWithToggle.ALWAYS;
>@@ -295,7 +287,6 @@
> 	IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();
> 
> 	setProjectName(store.getString(CommonUITraceConstants.TRACE_PROJECT_NAME));		
>-	setLocalHostPort(store.getString(CommonUIConstants.LOCALHOST_PORT));
> 	setInfoMsgOption(store.getBoolean(TraceConstants.PROFILE_TIPS));
> 	setReloadMsgOption(store.getBoolean(CommonUITraceConstants.RELOAD_INFO));
> 	/* Navid Mehregani - bugzilla_158635: The SAVE_ON_EXIT_KEY option should be read and stored in the preference store of CommonUITracePlugin */ 
>@@ -352,11 +343,6 @@
> 	_projectName.setText(name);
> }
> 
>-public void setLocalHostPort(String portNum)
>-{
>-	_localPort.setText(portNum);
>-}
>-
> public void setSaveOnExitOption(String value) {
> 	if (MessageDialogWithToggle.ALWAYS.equals(value)) {
> 		_always.setSelection(true);
>@@ -422,33 +408,4 @@
>    }
> }
> 
>-public void modifyText(ModifyEvent e)
>-{
>-	if (e.widget == _localPort)
>-	{
>-		try
>-		{
>-			if (_localPort.getText().trim() == "")
>-			{
>-				_preferencePage.setErrorMessage(UIPlugin.getResourceString(TraceMessages.RAC_EMPTY_PORT));
>-				return;
>-			}
>-			
>-			int value = Integer.parseInt(_localPort.getText().trim());
>-			if (value<0)
>-			{
>-				_preferencePage.setErrorMessage(UIPlugin.getResourceString(TraceMessages.RAC_INV_PRT));
>-				_localPort.setFocus();
>-				return;
>-			}
>-			_preferencePage.setErrorMessage(null);
>-		}
>-		catch (NumberFormatException nfe)
>-		{
>-			if (_preferencePage != null)
>-				_preferencePage.setErrorMessage(UIPlugin.getResourceString(TraceMessages.RAC_INV_PRT));
>-				_localPort.setFocus();
>-		}
>-	}
>-}
> }
>Index: src/org/eclipse/hyades/trace/ui/internal/preferences/TraceBasePreferencePage.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/preferences/TraceBasePreferencePage.java,v
>retrieving revision 1.9
>diff -u -r1.9 TraceBasePreferencePage.java
>--- src/org/eclipse/hyades/trace/ui/internal/preferences/TraceBasePreferencePage.java	5 Apr 2007 04:17:13 -0000	1.9
>+++ src/org/eclipse/hyades/trace/ui/internal/preferences/TraceBasePreferencePage.java	3 Mar 2008 17:11:47 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
>  * All rights reserved.   This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -100,7 +100,7 @@
> 	_options.setRefreshType(store.getDefaultInt(TraceConstants.REFRESH_TYPE), store.getDefaultInt(TraceConstants.REFRESH_INTERVAL));
> 
> 	store = UIPlugin.getDefault().getPreferenceStore();
>-	_options.setLocalHostPort(store.getDefaultString(CommonUIConstants.LOCALHOST_PORT));
>+//	_options.setLocalHostPort(store.getDefaultString(CommonUIConstants.LOCALHOST_PORT));
> }
> /**
>  * Does anything necessary because the default button has been pressed.
>@@ -127,7 +127,6 @@
> 	IPreferenceStore store = getPreferenceStore();
> 	
> 	store.setValue(CommonUITraceConstants.TRACE_PROJECT_NAME, _options.getProjectName());	
>-	store.setValue(CommonUIConstants.LOCALHOST_PORT, _options.getLocalPortNumber());	
> 	store.setValue(TraceConstants.PROFILE_TIPS, _options.getInfoMsgOption());	
> 	store.setValue(CommonUITraceConstants.RELOAD_INFO, _options.getReloadMsgOption());
> 	/* Navid Mehregani - bugzilla_158635: The SAVE_ON_EXIT_KEY option should be read and stored in the preference store of CommonUITracePlugin */
>#P org.eclipse.tptp.platform.common.ui.trace
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui.trace/plugin.properties,v
>retrieving revision 1.4
>diff -u -r1.4 plugin.properties
>--- plugin.properties	12 Dec 2007 02:19:29 -0000	1.4
>+++ plugin.properties	3 Mar 2008 17:11:49 -0000
>@@ -1,5 +1,5 @@
> ############################################################################### 
>-# Copyright (c) 2006, 2007 IBM Corporation and others. 
>+# Copyright (c) 2006, 2008 IBM Corporation and others. 
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -15,5 +15,4 @@
> plugin.name=TPTP Common UI Trace Plug-in
> plugin.provider=Eclipse.org
> 
>-P_NODEP                         = Hosts
> TRC_LGNW                        = Profiling and Logging
>\ No newline at end of file
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui.trace/plugin.xml,v
>retrieving revision 1.7
>diff -u -r1.7 plugin.xml
>--- plugin.xml	28 Feb 2008 23:13:09 -0000	1.7
>+++ plugin.xml	3 Mar 2008 17:11:49 -0000
>@@ -23,18 +23,7 @@
> 			name="%TRC_LGNW"
> 			id="org.eclipse.hyades.trace_log.newWizard">
> 		</category>
>-	</extension>
>-   
>-	
>-	<extension point="org.eclipse.ui.preferencePages">
>-		<page
>-			name="%P_NODEP"
>-            category="org.eclipse.hyades.trace.ui.internal.preferences.TraceBasePreferencePage"
>-            class="org.eclipse.hyades.trace.ui.internal.preferences.HostPreferencePage"
>-            id="org.eclipse.hyades.trace.ui.internal.preferences.HostPreferencePage">
>-		</page>     
>-	</extension>
>-   
>+	</extension> 
>    
>  <extension
>        point="org.eclipse.tptp.platform.models.hierarchy.handler">

Actions: View | Diff

Attachments on bug 199594: 91403 | 91581 | 92181 | 92194