Attachment #92181 for bug #199594

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

Lines 22-27 Link Here

(-)src/org/eclipse/tptp/platform/jvmti/client/internal/launcher/TIAttachLauncherDelegate.java (-1 / +2 lines)
22	import org.eclipse.hyades.trace.ui.UIPlugin;	22	import org.eclipse.hyades.trace.ui.UIPlugin;
23	import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;	23	import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;
24	import org.eclipse.hyades.trace.ui.internal.launcher.SelectedAgent;	24	import org.eclipse.hyades.trace.ui.internal.launcher.SelectedAgent;
		25	import org.eclipse.hyades.ui.HyadesUIPlugin;
25	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;	26	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;
26	import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceConstants;	27	import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceConstants;
27	import org.eclipse.tptp.platform.execution.client.agent.IAgent;	28	import org.eclipse.tptp.platform.execution.client.agent.IAgent;
Lines 83-89 Link Here
83	public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException	84	public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException
84	{	85	{
85	String hostName = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, CommonUITraceConstants.LOCAL_HOST);	86	String hostName = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, CommonUITraceConstants.LOCAL_HOST);
86	int port = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, UIPlugin.getDefault().getPreferenceStore().getDefaultInt(CommonUIConstants.LOCALHOST_PORT));	87	int port = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, HyadesUIPlugin.getInstance().getPreferenceStore().getDefaultInt(CommonUIConstants.LOCALHOST_PORT));
87		88
88	try	89	try
89	{	90	{

Lines 16-21 Link Here

(-)src/org/eclipse/tptp/platform/jvmti/client/internal/launcher/AgentAvailibilityTester.java (-1 / +2 lines)
16	import org.eclipse.debug.core.ILaunchConfiguration;	16	import org.eclipse.debug.core.ILaunchConfiguration;
17	import org.eclipse.hyades.trace.ui.UIPlugin;	17	import org.eclipse.hyades.trace.ui.UIPlugin;
18	import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;	18	import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;
		19	import org.eclipse.hyades.ui.HyadesUIPlugin;
19	import org.eclipse.jface.preference.IPreferenceStore;	20	import org.eclipse.jface.preference.IPreferenceStore;
20	import org.eclipse.osgi.util.NLS;	21	import org.eclipse.osgi.util.NLS;
21	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;	22	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;
Lines 78-84 Link Here
78	/* Determine the port number from the preference page if it's not stored as part of the configuration */	79	/* Determine the port number from the preference page if it's not stored as part of the configuration */
79	if (port == -1)	80	if (port == -1)
80	{	81	{
81	IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();	82	IPreferenceStore store = HyadesUIPlugin.getInstance().getPreferenceStore();
82	port = store.getInt(CommonUIConstants.LOCALHOST_PORT);	83	port = store.getInt(CommonUIConstants.LOCALHOST_PORT);
83	}	84	}
84	} catch (CoreException e)	85	} catch (CoreException e)

Lines 28-35 Link Here

(-)plugin.xml (-1 / +5 lines)
28	<!-- The host preference page -->	28	<!-- The host preference page -->
29	<extension point="org.eclipse.ui.preferencePages">	29	<extension point="org.eclipse.ui.preferencePages">
30	<page	30	<page
		31	class="org.eclipse.hyades.trace.ui.internal.preferences.ACPreferencePage"
		32	id="org.eclipse.hyades.trace.ui.internal.preferences.ACPreferencePage"
		33	name="%P_NODE"/>
		34	<page
31	name="%P_NODEP"	35	name="%P_NODEP"
32	category="org.eclipse.hyades.trace.ui.internal.preferences.TraceBasePreferencePage"	36	category="org.eclipse.hyades.trace.ui.internal.preferences.ACPreferencePage"
33	class="org.eclipse.hyades.trace.ui.internal.preferences.HostPreferencePage"	37	class="org.eclipse.hyades.trace.ui.internal.preferences.HostPreferencePage"
34	id="org.eclipse.hyades.trace.ui.internal.preferences.HostPreferencePage">	38	id="org.eclipse.hyades.trace.ui.internal.preferences.HostPreferencePage">
35	</page>	39	</page>

Lines 15-19 Link Here

(-)plugin.properties (+1 lines)
15	plugin.name=TPTP Common UI Trace Plug-in	15	plugin.name=TPTP Common UI Trace Plug-in
16	plugin.provider=Eclipse.org	16	plugin.provider=Eclipse.org
17		17
		18	P_NODE = Agent Controller
18	P_NODEP = Hosts	19	P_NODEP = Hosts
19	TRC_LGNW = Profiling and Logging	20	TRC_LGNW = Profiling and Logging

Lines 89-95 Link Here

(-)src/org/eclipse/tptp/platform/common/ui/trace/internal/CommonUITracePlugin.java (-1 / +1 lines)
89	{	89	{
90	/* Default hosts */	90	/* Default hosts */
91	store.setDefault(CommonUIConstants.HOST_KEY,"localhost:10002");	91	store.setDefault(CommonUIConstants.HOST_KEY,"localhost:10002");
92	store.setDefault(CommonUIConstants.LOCALHOST_PORT, "10002");	92	// store.setDefault(CommonUIConstants.LOCALHOST_PORT, "10002");
93		93
94	/* Trace options */	94	/* Trace options */
95	store.setDefault(CommonUITraceConstants.TRACE_PROJECT_NAME, CommonUITraceMessages.TRC_LOCD);	95	store.setDefault(CommonUITraceConstants.TRACE_PROJECT_NAME, CommonUITraceMessages.TRC_LOCD);




###############################################################################
# Copyright (c) 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
# http://www.eclipse.org/legal/epl-v10.html
# $Id: ACMessages.properties,v 1.0 2008/04/04 17:22:31 ritwikl Exp $
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################

_1 = Agent Controller Preferences 
_2 = Agent Controller local port: 
	
_3 = Agent Controller port cannot be empty
_4 = Invalid port number for Agent Controller




/**********************************************************************
 * Copyright (c) 2007, 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
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: ACPreferencePage.java,v 1.1 2007/04/19 19:35:37 nmehrega Exp $
 * 
 * Contributors: 
 * IBM - Initial API and implementation
 **********************************************************************/

package org.eclipse.hyades.trace.ui.internal.preferences;

import org.eclipse.hyades.ui.util.GridUtil;
import org.eclipse.jface.dialogs.Dialog;
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.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
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.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.PlatformUI;

public class ACPreferencePage extends PreferencePage
	implements IWorkbenchPreferencePage, ModifyListener {
	
	private IPreferenceStore store = CommonUIPlugin.getDefault().getPreferenceStore(); 
	private Text _localPort;
    
    
	public Composite createControls(Composite parent)
	{
		GridLayout layout;
		GridData data;
		
		Composite content = new Composite(parent, SWT.NONE);
		layout = new GridLayout();
		layout.numColumns = 1;
		layout.verticalSpacing = 10;
		content.setLayout(layout);
		content.setLayoutData(GridUtil.createFill()); 
		
		Group profilingInfo = new Group(content, SWT.NULL);
		profilingInfo.setText(ACPrefMessages._1);	
		layout = new GridLayout();
		layout.numColumns = 2;
		profilingInfo.setLayout(layout);
		profilingInfo.setLayoutData(GridUtil.createHorizontalFill());
		
		Label portdesc = new Label(profilingInfo, SWT.NULL);
		portdesc.setText(ACPrefMessages._2);
		_localPort = new Text(profilingInfo, SWT.BORDER);
		data = GridUtil.createHorizontalFill();
		_localPort.setLayoutData(data);
		_localPort.addModifyListener(this);
		
		initializeValues();
		
		Dialog.applyDialogFont( content );
		
		return content;  
	}
	
	private void initializeValues()
	{
		store = CommonUIPlugin.getDefault().getPreferenceStore();
		setLocalHostPort(store.getString(CommonUIConstants.LOCALHOST_PORT));
	}


	public String getLocalPortNumber() {
		return _localPort.getText().trim();
	}
	
	public void setLocalHostPort(String portNum)
	{
		_localPort.setText(portNum);
	}
	
	public void modifyText(ModifyEvent e)
	{
		if (e.widget == _localPort)
		{
			try
			{
				if (_localPort.getText().trim() == "")
				{
					setErrorMessage(ACPrefMessages._3);
					return;
				}
				
				int value = Integer.parseInt(_localPort.getText().trim());
				if (value<0)
				{
					setErrorMessage(ACPrefMessages._4);
					_localPort.setFocus();
					return;
				}
				setErrorMessage(null);
			}
			catch (NumberFormatException nfe)
			{
				if (this != null)
					setErrorMessage(ACPrefMessages._4);
					_localPort.setFocus();
			}
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
	 */
	public void init(IWorkbench workbench) {
        // Do nothing
	}

	public Control createContents(Composite parent) {

		Composite comp = new Composite( parent, SWT.NONE );
		
		PlatformUI.getWorkbench().getHelpSystem().setHelp(
				parent,
				CommonUIPlugin.getID()+".tbpp0000");
				
		GridLayout layout= new GridLayout();
		layout.marginWidth= 0;
		layout.marginHeight= 5;	
		layout.numColumns= 1;		
		comp.setLayout(layout);
		
		createControls(comp);

		Dialog.applyDialogFont( comp );
		
		return comp;
	}
	
	/**
	 * Initializes states of the controls using default values
	 * in the preference store.
	 */
	private void initializeDefaults()
	{
		setLocalHostPort(store.getDefaultString(CommonUIConstants.LOCALHOST_PORT));
	}
	/**
	 * Does anything necessary because the default button has been pressed.
	 */
	protected void performDefaults() {
		initializeDefaults();
	}
	/**
	 * Do anything necessary because the OK button has been pressed.
	 *
	 * @return whether it is okay to close the preference page
	 */
	public boolean performOk() {
		storeValues();
		CommonUIPlugin.getDefault().savePluginPreferences();
		return true;
	}
	
	/**
	 * Stores the values of the controls back to the preference store.
	 */
	private void storeValues()
	{		
		store.setValue(CommonUIConstants.LOCALHOST_PORT, this.getLocalPortNumber());	
	}
}





/**********************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: ACPrefMessages.java,v 1.0 2008/04/04 17:20:37 ritwikl Exp $
 * 
 * Contributors: 
 * IBM - Initial API and implementation
 **********************************************************************/

package org.eclipse.hyades.trace.ui.internal.preferences;

import org.eclipse.osgi.util.NLS;

public class ACPrefMessages extends NLS {
	protected static final String BUNDLE_NAME = "org.eclipse.hyades.trace.ui.internal.preferences.messages"; //$NON-NLS-1$
	
	protected ACPrefMessages() {
	}

	static {
		// initialize resource bundle
		NLS.initializeMessages(BUNDLE_NAME, ACPrefMessages.class);
	}
	
	public static String _1;
	public static String _2;
	
	public static String _3;
	public static String _4;

}

Lines 255-260 Link Here

(-)src-common-internal/org/eclipse/tptp/platform/common/ui/internal/CommonUIPlugin.java (+1 lines)
255		255
256	protected void initializeDefaultPreferences(IPreferenceStore store) {	256	protected void initializeDefaultPreferences(IPreferenceStore store) {
257	store.setDefault(HyadesUI.SWITCH_TO_PERSPECTIVE_KEY, MessageDialogWithToggle.PROMPT);	257	store.setDefault(HyadesUI.SWITCH_TO_PERSPECTIVE_KEY, MessageDialogWithToggle.PROMPT);
		258	store.setDefault(CommonUIConstants.LOCALHOST_PORT, "10002");
258	}	259	}
259		260
260	public static void log(Throwable e) {	261	public static void log(Throwable e) {

Lines 32-37 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/core/TraceProfileUI.java (-1 / +2 lines)
32	import org.eclipse.hyades.trace.ui.internal.util.TraceMessages;	32	import org.eclipse.hyades.trace.ui.internal.util.TraceMessages;
33	import org.eclipse.hyades.trace.ui.launcher.IProfilingSetType;	33	import org.eclipse.hyades.trace.ui.launcher.IProfilingSetType;
34	import org.eclipse.hyades.trace.ui.launcher.ProfilingSetsManagerCopy;	34	import org.eclipse.hyades.trace.ui.launcher.ProfilingSetsManagerCopy;
		35	import org.eclipse.hyades.ui.HyadesUIPlugin;
35	import org.eclipse.jface.viewers.CheckStateChangedEvent;	36	import org.eclipse.jface.viewers.CheckStateChangedEvent;
36	import org.eclipse.jface.viewers.CheckboxTreeViewer;	37	import org.eclipse.jface.viewers.CheckboxTreeViewer;
37	import org.eclipse.jface.viewers.DoubleClickEvent;	38	import org.eclipse.jface.viewers.DoubleClickEvent;
Lines 568-574 Link Here
568	try	569	try
569	{	570	{
570	String currentHost = conf.getAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, CommonUITraceConstants.LOCAL_HOST);	571	String currentHost = conf.getAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, CommonUITraceConstants.LOCAL_HOST);
571	int currentPort = conf.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, UIPlugin.getDefault().getPreferenceStore().getDefaultInt(CommonUIConstants.LOCALHOST_PORT));	572	int currentPort = conf.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, HyadesUIPlugin.getInstance().getPreferenceStore().getDefaultInt(CommonUIConstants.LOCALHOST_PORT));
572		573
573		574
574	ConnectUtil connect = new ConnectUtil( currentHost, ""+currentPort,null);	575	ConnectUtil connect = new ConnectUtil( currentHost, ""+currentPort,null);




/**********************************************************************
 * 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

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;

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;

* CONTEXT_ID tbpp0006 for Local IBM Remote Agent port number entry field in Profiling(Trace) preference page
*/

public class TraceOptionsUI implements SelectionListener 
{
	private Button _enableInfoMsg;
	private Button _enableReloadMsg;

	private Button _neverPersp;
	private Button _promptPersp;
	private Text _projectName;
	private Text _localPort;
    private PreferencePage _preferencePage;
    
    private Button _manualRefreshBtn;

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

	_enableInfoMsg = new Button(profilingInfo, SWT.CHECK);
	_enableInfoMsg.setText(UIPlugin.getResourceString(TraceMessages.SP_TIP));
	data = new GridData();

	return _projectName.getText().trim();
}

public String getLocalPortNumber() {
	return _localPort.getText().trim();
}

public String getSaveOnExitOption() {
	if (_always.getSelection()) {
		return MessageDialogWithToggle.ALWAYS;

	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 */ 

	_projectName.setText(name);
}

public void setLocalHostPort(String portNum)
{
	_localPort.setText(portNum);
}

public void setSaveOnExitOption(String value) {
	if (MessageDialogWithToggle.ALWAYS.equals(value)) {
		_always.setSelection(true);

   }
}

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

Lines 60-65 Link Here

(-)src/org/eclipse/tptp/trace/ui/internal/launcher/core/LauncherUtility.java (-1 / +2 lines)
60	import org.eclipse.hyades.trace.ui.launcher.IProfilingSet;	60	import org.eclipse.hyades.trace.ui.launcher.IProfilingSet;
61	import org.eclipse.hyades.trace.ui.launcher.IProfilingSetType;	61	import org.eclipse.hyades.trace.ui.launcher.IProfilingSetType;
62	import org.eclipse.hyades.trace.ui.launcher.ProfilingAttribute;	62	import org.eclipse.hyades.trace.ui.launcher.ProfilingAttribute;
		63	import org.eclipse.hyades.ui.HyadesUIPlugin;
63	import org.eclipse.jdt.launching.IVMRunner;	64	import org.eclipse.jdt.launching.IVMRunner;
64	import org.eclipse.jdt.launching.VMRunnerConfiguration;	65	import org.eclipse.jdt.launching.VMRunnerConfiguration;
65	import org.eclipse.jface.dialogs.ErrorDialog;	66	import org.eclipse.jface.dialogs.ErrorDialog;
Lines 825-831 Link Here
825	*/	826	*/
826	public static int getPort (ILaunchConfiguration conf) throws CoreException	827	public static int getPort (ILaunchConfiguration conf) throws CoreException
827	{	828	{
828	IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();	829	IPreferenceStore store = HyadesUIPlugin.getInstance().getPreferenceStore();
829	int port = conf.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, store.getInt(CommonUIConstants.LOCALHOST_PORT));	830	int port = conf.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, store.getInt(CommonUIConstants.LOCALHOST_PORT));
830	return port;	831	return port;
831	}	832	}

Lines 39-44 Link Here

(-)src/org/eclipse/tptp/trace/ui/internal/launcher/deleg/application/PIDelegateHelper.java (-1 / +2 lines)
39	import org.eclipse.hyades.trace.ui.internal.piclient.PIProcessListener;	39	import org.eclipse.hyades.trace.ui.internal.piclient.PIProcessListener;
40	import org.eclipse.hyades.trace.ui.internal.util.PDCoreUtil;	40	import org.eclipse.hyades.trace.ui.internal.util.PDCoreUtil;
41	import org.eclipse.hyades.trace.ui.launcher.IProfilingType;	41	import org.eclipse.hyades.trace.ui.launcher.IProfilingType;
		42	import org.eclipse.hyades.ui.HyadesUIPlugin;
42	import org.eclipse.tptp.platform.common.internal.CommonPlugin;	43	import org.eclipse.tptp.platform.common.internal.CommonPlugin;
43	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;	44	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;
44	import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceConstants;	45	import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceConstants;
Lines 419-425 Link Here
419	try	420	try
420	{	421	{
421	JVMVersionDetector.this.host = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, CommonUITraceConstants.LOCAL_HOST);	422	JVMVersionDetector.this.host = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, CommonUITraceConstants.LOCAL_HOST);
422	JVMVersionDetector.this.port = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, UIPlugin.getDefault().getPreferenceStore().getDefaultInt(CommonUIConstants.LOCALHOST_PORT));	423	JVMVersionDetector.this.port = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, HyadesUIPlugin.getInstance().getPreferenceStore().getDefaultInt(CommonUIConstants.LOCALHOST_PORT));
423	}	424	}
424	catch (CoreException e)	425	catch (CoreException e)
425	{	426	{

Lines 18-23 Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/util/AttachConfigurationDetail.java (-1 / +2 lines)
18	import org.eclipse.debug.core.ILaunchConfiguration;	18	import org.eclipse.debug.core.ILaunchConfiguration;
19	import org.eclipse.hyades.trace.ui.UIPlugin;	19	import org.eclipse.hyades.trace.ui.UIPlugin;
20	import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;	20	import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;
		21	import org.eclipse.hyades.ui.HyadesUIPlugin;
21	import org.eclipse.jface.preference.IPreferenceStore;	22	import org.eclipse.jface.preference.IPreferenceStore;
22	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;	23	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;
23	import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceConstants;	24	import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceConstants;
Lines 83-89 Link Here
83	{	84	{
84	try	85	try
85	{	86	{
86	IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();	87	IPreferenceStore store = HyadesUIPlugin.getInstance().getPreferenceStore();
87	this.hostName = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, CommonUITraceConstants.LOCAL_HOST);	88	this.hostName = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, CommonUITraceConstants.LOCAL_HOST);
88	this.portNumber = String.valueOf(configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, store.getInt(CommonUIConstants.LOCALHOST_PORT)));	89	this.portNumber = String.valueOf(configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, store.getInt(CommonUIConstants.LOCALHOST_PORT)));
89	this.project = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_DESTINATION_PROJECT, store.getString(CommonUITraceConstants.TRACE_PROJECT_NAME));	90	this.project = configuration.getAttribute(IProfileLaunchConfigurationConstants.ATTR_DESTINATION_PROJECT, store.getString(CommonUITraceConstants.TRACE_PROJECT_NAME));




/**********************************************************************
 * 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

import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
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;

 */
private void initializeDefaults()
{
  	IPreferenceStore store = getPreferenceStore();

	_options.setInfoMsgOption(store.getDefaultBoolean(TraceConstants.PROFILE_TIPS));
	_options.setReloadMsgOption(store.getDefaultBoolean(CommonUITraceConstants.RELOAD_INFO));

	_options.setSwitchPerspOption(CommonUIPlugin.getDefault().getPreferenceStore().getDefaultString(HyadesUI.SWITCH_TO_PERSPECTIVE_KEY));
	_options.setRefreshType(store.getDefaultInt(TraceConstants.REFRESH_TYPE), store.getDefaultInt(TraceConstants.REFRESH_INTERVAL));

	store = UIPlugin.getDefault().getPreferenceStore();
	_options.setLocalHostPort(store.getDefaultString(CommonUIConstants.LOCALHOST_PORT));
}
/**
 * Does anything necessary because the default button has been pressed.

	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 */

Lines 29-35 Link Here

(-)plugin.properties (-1 lines)
29	_8 = Sample Wizards	29	_8 = Sample Wizards
30	_9 = Security Certificate	30	_9 = Security Certificate
31	_10 = Import a Security Certificate to allow secure connections to agent controller.	31	_10 = Import a Security Certificate to allow secure connections to agent controller.
32	_11 = Agent Controller
33	_12 = Scroll up the sequence diagram	32	_12 = Scroll up the sequence diagram
34	_14 = Scroll down the sequence diagram	33	_14 = Scroll down the sequence diagram
35	_16 = Scroll left the sequence diagram	34	_16 = Scroll left the sequence diagram




   </extension>

<!-- ==================================================================== -->
<!-- Preferences pages - Agent Controller > Security Preference           -->
<!-- ==================================================================== -->
   <extension
         point="org.eclipse.ui.preferencePages">
      <page
            class="org.eclipse.hyades.security.internal.preference.ACPreferencePage"
            id="org.eclipse.hyades.security.internal.preference.ACPreferencePage"
            name="%_11"/>
      <page
            class="org.eclipse.hyades.security.internal.preference.SecurityPreferencePage"
            id="org.eclipse.hyades.security.internal.preference.SecurityPreferencePage"
            category="org.eclipse.hyades.trace.ui.internal.preferences.ACPreferencePage"
            name="%_9"/>
   </extension>
<!-- ==================================================================== -->

Lines 1-5 Link Here

(-)src/org/eclipse/hyades/ui/HyadesUIPlugin.java (-2 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2006 IBM Corporation and others.	2	* Copyright (c) 2005, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 23-30 Link Here
23	import org.eclipse.hyades.ui.internal.logicalfolder.LogicalFolder;	23	import org.eclipse.hyades.ui.internal.logicalfolder.LogicalFolder;
24	import org.eclipse.hyades.ui.internal.util.ResourceBundleManager;	24	import org.eclipse.hyades.ui.internal.util.ResourceBundleManager;
25	import org.eclipse.hyades.ui.util.ILogger;	25	import org.eclipse.hyades.ui.util.ILogger;
		26	import org.eclipse.jface.preference.IPreferenceStore;
26	import org.eclipse.swt.widgets.Display;	27	import org.eclipse.swt.widgets.Display;
27	import org.eclipse.tptp.platform.common.internal.CommonPlugin;	28	import org.eclipse.tptp.platform.common.internal.CommonPlugin;
		29	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;
28	import org.eclipse.ui.plugin.AbstractUIPlugin;	30	import org.eclipse.ui.plugin.AbstractUIPlugin;
29	import org.osgi.framework.BundleContext;	31	import org.osgi.framework.BundleContext;
30		32
Lines 96-101 Link Here
96	return instance;	98	return instance;
97	}	99	}
98		100
		101	protected void initializePreferences()
		102	{
		103	/* Default host */
		104	IPreferenceStore store = getPreferenceStore();
		105	}
99		106
100	/**	107	/**
101	* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)	108	* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
Lines 131-137 Link Here
131	Display.getDefault().asyncExec(operation);	138	Display.getDefault().asyncExec(operation);
132	}	139	}
133		140
134	restoreFilterSelections();	141	restoreFilterSelections();
		142
		143	initializePreferences();
135	}	144	}
136		145
137	/**	146	/**




/**********************************************************************
 * Copyright (c) 2007 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
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: ACPreferencePage.java,v 1.1 2007/04/19 19:35:37 nmehrega Exp $
 * 
 * Contributors: 
 * IBM - Initial API and implementation
 **********************************************************************/

package org.eclipse.hyades.security.internal.preference;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;

public class ACPreferencePage extends PreferencePage
	implements IWorkbenchPreferencePage {
	
	/* (non-Javadoc)
	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
	 */
	public void init(IWorkbench workbench) {
        // Do nothing
	}

	protected Control createContents(Composite parent) {
		Composite comp = new Composite( parent, SWT.NONE );
		
		Dialog.applyDialogFont( comp );
		
		return comp;
	}

}

Lines 19-25 Link Here

(-)plugin.xml (-1 / +1 lines)
19	<page	19	<page
20	class="org.eclipse.tptp.platform.iac.administrator.internal.preference.IACPreferencePage"	20	class="org.eclipse.tptp.platform.iac.administrator.internal.preference.IACPreferencePage"
21	id="org.eclipse.tptp.platform.iac.administrator.internal.preference.IACPreferencePage"	21	id="org.eclipse.tptp.platform.iac.administrator.internal.preference.IACPreferencePage"
22	category="org.eclipse.hyades.security.internal.preference.ACPreferencePage"	22	category="org.eclipse.hyades.trace.ui.internal.preferences.ACPreferencePage"
23	name="%preference.name">	23	name="%preference.name">
24	</page>	24	</page>
25	</extension>	25	</extension>

Lines 26-31 Link Here

(-)src/org/eclipse/tptp/platform/profile/server/core/internal/ProfileOnServerAdapter.java (-1 / +2 lines)
26	import org.eclipse.hyades.trace.ui.internal.launcher.AttachDelegate;	26	import org.eclipse.hyades.trace.ui.internal.launcher.AttachDelegate;
27	import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;	27	import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;
28	import org.eclipse.hyades.trace.ui.internal.util.PDCoreUtil;	28	import org.eclipse.hyades.trace.ui.internal.util.PDCoreUtil;
		29	import org.eclipse.hyades.ui.HyadesUIPlugin;
29	import org.eclipse.jface.dialogs.Dialog;	30	import org.eclipse.jface.dialogs.Dialog;
30	import org.eclipse.jface.wizard.WizardDialog;	31	import org.eclipse.jface.wizard.WizardDialog;
31	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;	32	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;
Lines 57-63 Link Here
57	}	58	}
58		59
59	/* get port number */	60	/* get port number */
60	int port = wc.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, UIPlugin.getDefault().getPreferenceStore().getInt(CommonUIConstants.LOCALHOST_PORT));	61	int port = wc.getAttribute(IProfileLaunchConfigurationConstants.ATTR_PORT, HyadesUIPlugin.getInstance().getPreferenceStore().getInt(CommonUIConstants.LOCALHOST_PORT));
61		62
62	/* set host and port attribute of launch configuration */	63	/* set host and port attribute of launch configuration */
63	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, hostname);	64	wc.setAttribute(IProfileLaunchConfigurationConstants.ATTR_HOSTNAME, hostname);

Return to bug 199594

Added Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/preferences/messages.properties (+17 lines)
1	###############################################################################
2	# Copyright (c) 2008 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at
6	# http://www.eclipse.org/legal/epl-v10.html
7	# $Id: ACMessages.properties,v 1.0 2008/04/04 17:22:31 ritwikl Exp $
8	#
9	# Contributors:
10	# IBM Corporation - initial API and implementation
11	###############################################################################
12
13	_1 = Agent Controller Preferences
14	_2 = Agent Controller local port:
15
16	_3 = Agent Controller port cannot be empty
17	_4 = Invalid port number for Agent Controller

Added Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/preferences/ACPreferencePage.java (+182 lines)
1	/**********************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: ACPreferencePage.java,v 1.1 2007/04/19 19:35:37 nmehrega Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12
13	package org.eclipse.hyades.trace.ui.internal.preferences;
14
15	import org.eclipse.hyades.ui.util.GridUtil;
16	import org.eclipse.jface.dialogs.Dialog;
17	import org.eclipse.jface.preference.IPreferenceStore;
18	import org.eclipse.jface.preference.PreferencePage;
19	import org.eclipse.swt.SWT;
20	import org.eclipse.swt.events.ModifyEvent;
21	import org.eclipse.swt.events.ModifyListener;
22	import org.eclipse.swt.layout.GridData;
23	import org.eclipse.swt.layout.GridLayout;
24	import org.eclipse.swt.widgets.Composite;
25	import org.eclipse.swt.widgets.Control;
26	import org.eclipse.swt.widgets.Group;
27	import org.eclipse.swt.widgets.Label;
28	import org.eclipse.swt.widgets.Text;
29	import org.eclipse.tptp.platform.common.ui.internal.CommonUIConstants;
30	import org.eclipse.tptp.platform.common.ui.internal.CommonUIPlugin;
31	import org.eclipse.ui.IWorkbench;
32	import org.eclipse.ui.IWorkbenchPreferencePage;
33	import org.eclipse.ui.PlatformUI;
34
35	public class ACPreferencePage extends PreferencePage
36	implements IWorkbenchPreferencePage, ModifyListener {
37
38	private IPreferenceStore store = CommonUIPlugin.getDefault().getPreferenceStore();
39	private Text _localPort;
40
41
42	public Composite createControls(Composite parent)
43	{
44	GridLayout layout;
45	GridData data;
46
47	Composite content = new Composite(parent, SWT.NONE);
48	layout = new GridLayout();
49	layout.numColumns = 1;
50	layout.verticalSpacing = 10;
51	content.setLayout(layout);
52	content.setLayoutData(GridUtil.createFill());
53
54	Group profilingInfo = new Group(content, SWT.NULL);
55	profilingInfo.setText(ACPrefMessages._1);
56	layout = new GridLayout();
57	layout.numColumns = 2;
58	profilingInfo.setLayout(layout);
59	profilingInfo.setLayoutData(GridUtil.createHorizontalFill());
60
61	Label portdesc = new Label(profilingInfo, SWT.NULL);
62	portdesc.setText(ACPrefMessages._2);
63	_localPort = new Text(profilingInfo, SWT.BORDER);
64	data = GridUtil.createHorizontalFill();
65	_localPort.setLayoutData(data);
66	_localPort.addModifyListener(this);
67
68	initializeValues();
69
70	Dialog.applyDialogFont( content );
71
72	return content;
73	}
74
75	private void initializeValues()
76	{
77	store = CommonUIPlugin.getDefault().getPreferenceStore();
78	setLocalHostPort(store.getString(CommonUIConstants.LOCALHOST_PORT));
79	}
80
81
82	public String getLocalPortNumber() {
83	return _localPort.getText().trim();
84	}
85
86	public void setLocalHostPort(String portNum)
87	{
88	_localPort.setText(portNum);
89	}
90
91	public void modifyText(ModifyEvent e)
92	{
93	if (e.widget == _localPort)
94	{
95	try
96	{
97	if (_localPort.getText().trim() == "")
98	{
99	setErrorMessage(ACPrefMessages._3);
100	return;
101	}
102
103	int value = Integer.parseInt(_localPort.getText().trim());
104	if (value<0)
105	{
106	setErrorMessage(ACPrefMessages._4);
107	_localPort.setFocus();
108	return;
109	}
110	setErrorMessage(null);
111	}
112	catch (NumberFormatException nfe)
113	{
114	if (this != null)
115	setErrorMessage(ACPrefMessages._4);
116	_localPort.setFocus();
117	}
118	}
119	}
120
121	/* (non-Javadoc)
122	* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
123	*/
124	public void init(IWorkbench workbench) {
125	// Do nothing
126	}
127
128	public Control createContents(Composite parent) {
129
130	Composite comp = new Composite( parent, SWT.NONE );
131
132	PlatformUI.getWorkbench().getHelpSystem().setHelp(
133	parent,
134	CommonUIPlugin.getID()+".tbpp0000");
135
136	GridLayout layout= new GridLayout();
137	layout.marginWidth= 0;
138	layout.marginHeight= 5;
139	layout.numColumns= 1;
140	comp.setLayout(layout);
141
142	createControls(comp);
143
144	Dialog.applyDialogFont( comp );
145
146	return comp;
147	}
148
149	/**
150	* Initializes states of the controls using default values
151	* in the preference store.
152	*/
153	private void initializeDefaults()
154	{
155	setLocalHostPort(store.getDefaultString(CommonUIConstants.LOCALHOST_PORT));
156	}
157	/**
158	* Does anything necessary because the default button has been pressed.
159	*/
160	protected void performDefaults() {
161	initializeDefaults();
162	}
163	/**
164	* Do anything necessary because the OK button has been pressed.
165	*
166	* @return whether it is okay to close the preference page
167	*/
168	public boolean performOk() {
169	storeValues();
170	CommonUIPlugin.getDefault().savePluginPreferences();
171	return true;
172	}
173
174	/**
175	* Stores the values of the controls back to the preference store.
176	*/
177	private void storeValues()
178	{
179	store.setValue(CommonUIConstants.LOCALHOST_PORT, this.getLocalPortNumber());
180	}
181	}
182

Added Link Here

(-)src/org/eclipse/hyades/trace/ui/internal/preferences/ACPrefMessages.java (+34 lines)
1	/**********************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: ACPrefMessages.java,v 1.0 2008/04/04 17:20:37 ritwikl Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12
13	package org.eclipse.hyades.trace.ui.internal.preferences;
14
15	import org.eclipse.osgi.util.NLS;
16
17	public class ACPrefMessages extends NLS {
18	protected static final String BUNDLE_NAME = "org.eclipse.hyades.trace.ui.internal.preferences.messages"; //$NON-NLS-1$
19
20	protected ACPrefMessages() {
21	}
22
23	static {
24	// initialize resource bundle
25	NLS.initializeMessages(BUNDLE_NAME, ACPrefMessages.class);
26	}
27
28	public static String _1;
29	public static String _2;
30
31	public static String _3;
32	public static String _4;
33
34	}

Lines 44-61 Link Here

(-)plugin.xml (-6 / +2 lines)
44	</extension>	44	</extension>
45		45
46	<!-- ==================================================================== -->	46	<!-- ==================================================================== -->
47	<!-- Preferences pages. -->	47	<!-- Preferences pages - Agent Controller > Security Preference -->
48	<!-- ==================================================================== -->	48	<!-- ==================================================================== -->
49	<extension	49	<extension
50	point="org.eclipse.ui.preferencePages">	50	point="org.eclipse.ui.preferencePages">
51	<page	51	<page
52	class="org.eclipse.hyades.security.internal.preference.ACPreferencePage"
53	id="org.eclipse.hyades.security.internal.preference.ACPreferencePage"
54	name="%_11"/>
55	<page
56	class="org.eclipse.hyades.security.internal.preference.SecurityPreferencePage"	52	class="org.eclipse.hyades.security.internal.preference.SecurityPreferencePage"
57	id="org.eclipse.hyades.security.internal.preference.SecurityPreferencePage"	53	id="org.eclipse.hyades.security.internal.preference.SecurityPreferencePage"
58	category="org.eclipse.hyades.security.internal.preference.ACPreferencePage"	54	category="org.eclipse.hyades.trace.ui.internal.preferences.ACPreferencePage"
59	name="%_9"/>	55	name="%_9"/>
60	</extension>	56	</extension>
61	<!-- ==================================================================== -->	57	<!-- ==================================================================== -->

Removed Link Here

(-)src/org/eclipse/hyades/security/internal/preference/ACPreferencePage.java (-41 lines)
1	/**********************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: ACPreferencePage.java,v 1.1 2007/04/19 19:35:37 nmehrega Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12
13	package org.eclipse.hyades.security.internal.preference;
14
15	import org.eclipse.jface.dialogs.Dialog;
16	import org.eclipse.jface.preference.PreferencePage;
17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.widgets.Composite;
19	import org.eclipse.swt.widgets.Control;
20	import org.eclipse.ui.IWorkbench;
21	import org.eclipse.ui.IWorkbenchPreferencePage;
22
23	public class ACPreferencePage extends PreferencePage
24	implements IWorkbenchPreferencePage {
25
26	/* (non-Javadoc)
27	* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
28	*/
29	public void init(IWorkbench workbench) {
30	// Do nothing
31	}
32
33	protected Control createContents(Composite parent) {
34	Composite comp = new Composite( parent, SWT.NONE );
35
36	Dialog.applyDialogFont( comp );
37
38	return comp;
39	}
40
41	}