Author: jjohnstn Date: 2010-08-09 11:51:43 -0400 (Mon, 09 Aug 2010) New Revision: 24004 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/DeltaCloudPreferencePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.properties Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java Log: 2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java: New file. * src/org/jboss/tools/deltacloud/ui/preferences/DeltaCloudPreferencePage.java: New file. * src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.java: New file. * src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.properties: New file. * plugin.properties: Add new messages to use in plugin extensions. * plugin.xml: Add perspective and preference page extensions. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (performFinish): Fix logic to not use PreferenceStore with MessageDialogWithToggle dialog since it is not the same as the InstanceScope preference area we are using elsewhere. Manually use the toggle value to set the preference. * src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java (ProfileComposite): Don't make cpu, memory, or storage labels go 100% to the right. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-09 15:34:42 UTC (rev 24003) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-09 15:51:43 UTC (rev 24004) @@ -1,3 +1,18 @@ +2010-08-09 Jeff Johnston <jjohnstn(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java: New file. + * src/org/jboss/tools/deltacloud/ui/preferences/DeltaCloudPreferencePage.java: New file. + * src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.java: New file. + * src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.properties: New file. + * plugin.properties: Add new messages to use in plugin extensions. + * plugin.xml: Add perspective and preference page extensions. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (performFinish): Fix + logic to not use PreferenceStore with MessageDialogWithToggle dialog since it is not the + same as the InstanceScope preference area we are using elsewhere. Manually use the toggle + value to set the preference. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java (ProfileComposite): Don't + make cpu, memory, or storage labels go 100% to the right. + 2010-08-06 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/ui/IDeltaCloudPreferenceConstants.java: New file. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-08-09 15:34:42 UTC (rev 24003) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2010-08-09 15:51:43 UTC (rev 24004) @@ -1,5 +1,7 @@ DeltaCloudCategory=Delta Cloud CloudViewerName=Cloud Viewer +DeltaCloudPerspective.name=Delta Cloud +Preferences.name=Delta Cloud Advanced.label=Advanced NewWizard.name=Cloud Connection \ No newline at end of file Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-08-09 15:34:42 UTC (rev 24003) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-08-09 15:51:43 UTC (rev 24004) @@ -70,5 +70,22 @@ name="%NewWizard.name"> </wizard> </extension> + <extension + point="org.eclipse.ui.perspectives"> + <perspective + class="org.jboss.tools.deltacloud.ui.DeltaCloudPerspective" + icon="icons/delta.gif" + id="org.jboss.tools.deltacloud.ui.perspective" + name="%DeltaCloudPerspective.name"> + </perspective> + </extension> + <extension + point="org.eclipse.ui.preferencePages"> + <page + class="org.jboss.tools.deltacloud.ui.preferences.DeltaCloudPreferencePage" + id="org.jboss.tools.deltacloud.ui.page1" + name="%Preferences.name"> + </page> + </extension> </plugin> Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java 2010-08-09 15:51:43 UTC (rev 24004) @@ -0,0 +1,16 @@ +package org.jboss.tools.deltacloud.ui; + +import org.eclipse.ui.IPageLayout; +import org.eclipse.ui.IPerspectiveFactory; + +public class DeltaCloudPerspective implements IPerspectiveFactory { + + @Override + public void createInitialLayout(IPageLayout layout) { + layout.addView("org.jboss.tools.deltacloud.ui.views.CloudView", IPageLayout.LEFT, + 0.25f, IPageLayout.ID_EDITOR_AREA); + layout.addView(IPageLayout.ID_PROP_SHEET, IPageLayout.BOTTOM, + 0.80f, IPageLayout.ID_EDITOR_AREA); + } + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/DeltaCloudPreferencePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/DeltaCloudPreferencePage.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/DeltaCloudPreferencePage.java 2010-08-09 15:51:43 UTC (rev 24004) @@ -0,0 +1,84 @@ +package org.jboss.tools.deltacloud.ui.preferences; + +import org.eclipse.core.runtime.preferences.InstanceScope; +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.jboss.tools.deltacloud.ui.Activator; +import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; +import org.osgi.service.prefs.BackingStoreException; +import org.osgi.service.prefs.Preferences; + +public class DeltaCloudPreferencePage extends PreferencePage implements + IWorkbenchPreferencePage { + + private final static String LAUNCH_WARN = "LaunchWarnPreference.msg"; //$NON-NLS-1$ + + private Button warnLaunch; + + public DeltaCloudPreferencePage() { + // TODO Auto-generated constructor stub + } + + public DeltaCloudPreferencePage(String title) { + super(title); + // TODO Auto-generated constructor stub + } + + public DeltaCloudPreferencePage(String title, ImageDescriptor image) { + super(title, image); + // TODO Auto-generated constructor stub + } + + @Override + public void performDefaults() { + warnLaunch.setSelection(false); + } + + + @Override + public boolean performOk() { + Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); + + boolean oldWarn = prefs.getBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, false); + if (oldWarn != warnLaunch.getSelection()) { + prefs.putBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, warnLaunch.getSelection()); + } + + try { + prefs.flush(); + } catch (BackingStoreException e) { + Activator.log(e); + } + return super.performOk(); + } + + @Override + protected Control createContents(Composite parent) { + final Composite container = new Composite(parent, SWT.NULL); + FormLayout layout = new FormLayout(); + layout.marginHeight = 5; + layout.marginWidth = 5; + container.setLayout(layout); + + Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); + + warnLaunch = new Button(container, SWT.CHECK); + warnLaunch.setText(PreferenceMessages.getString(LAUNCH_WARN)); + warnLaunch.setSelection(prefs.getBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, false)); + + return container; + } + + @Override + public void init(IWorkbench workbench) { + // Do nothing + } + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.java 2010-08-09 15:51:43 UTC (rev 24004) @@ -0,0 +1,29 @@ +package org.jboss.tools.deltacloud.ui.preferences; + +import java.text.MessageFormat; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +public class PreferenceMessages { + + private static final String BUNDLE_NAME = PreferenceMessages.class.getName(); + + public static String getString(String key) { + try { + return ResourceBundle.getBundle(BUNDLE_NAME).getString(key); + } catch (MissingResourceException e) { + return '!' + key + '!'; + } catch (NullPointerException e) { + return '#' + key + '#'; + } + } + + public static String getFormattedString(String key, String arg) { + return MessageFormat.format(getString(key), new Object[] { arg }); + } + + public static String getFormattedString(String key, String[] args) { + return MessageFormat.format(getString(key), (Object[])args); + } + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.properties (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/preferences/PreferenceMessages.properties 2010-08-09 15:51:43 UTC (rev 24004) @@ -0,0 +1 @@ +LaunchWarnPreference.msg=Do not warn me when launching an instance \ No newline at end of file Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-08-09 15:34:42 UTC (rev 24003) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-08-09 15:51:43 UTC (rev 24004) @@ -71,9 +71,15 @@ MessageDialogWithToggle.openOkCancelConfirm(getShell(), WizardMessages.getString(CONFIRM_CREATE_TITLE), WizardMessages.getString(CONFIRM_CREATE_MSG), WizardMessages.getString(DONT_SHOW_THIS_AGAIN_MSG), - false, Activator.getDefault().getPreferenceStore(), IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE); - if (dialog.getReturnCode() == Dialog.CANCEL) + false, null, null); + int retCode = dialog.getReturnCode(); + boolean toggleState = dialog.getToggleState(); + if (retCode == Dialog.CANCEL) return true; + // If warning turned off by user, set the preference for future usage + if (toggleState) { + prefs.putBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, true); + } } result = cloud.createInstance(name, imageId, realmId, profileId); } catch (DeltaCloudException e) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java 2010-08-09 15:34:42 UTC (rev 24003) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java 2010-08-09 15:51:43 UTC (rev 24004) @@ -163,7 +163,6 @@ FormData f = new FormData(); f.top = new FormAttachment(cpuControl, 8); f.left = new FormAttachment(storageLabel, 50); - f.right = new FormAttachment(100, 0); memory.setLayoutData(f); memoryControl = memory; } else if (memoryProperty.getKind() == DeltaCloudHardwareProperty.Kind.RANGE) { @@ -260,7 +259,6 @@ FormData f = new FormData(); f.left = new FormAttachment(storageLabel, 50); f.top = new FormAttachment(memoryControl, 8); - f.right = new FormAttachment(100, 0); storage.setLayoutData(f); storage.setVisible(true); storageControl = storage;