Author: rob.stryker(a)jboss.com
Date: 2009-02-09 22:33:36 -0500 (Mon, 09 Feb 2009)
New Revision: 13555
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-3641 branding
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2009-02-10 01:54:57
UTC (rev 13554)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2009-02-10 03:33:36
UTC (rev 13555)
@@ -19,9 +19,9 @@
jboss.version.50.description=JBoss Application Server 5.0
jboss.version.50.runtime.name=JBoss 5.0 Runtime
-jboss.eap.version.43.name=JBoss EAP 4.3
-jboss.eap.version.43.description=JBoss EAP Server 4.3
-jboss.eap.version.43.runtime.name=JBoss EAP 4.3 Runtime
+jboss.eap.version.43.name=JBoss Enterprise Application Platform 4.3
+jboss.eap.version.43.description=JBoss Enterprise Application Platform (EAP) 4.3
+jboss.eap.version.43.runtime.name=JBoss Enterprise Application Platform 4.3 Runtime
deploy.runtime.name=JBoss Deploy-Only Runtime
deploy.runtime.description=A runtime provided to allow a deploy-only server the ability
to deploy certain project types.
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-02-10
01:54:57 UTC (rev 13554)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-02-10
03:33:36 UTC (rev 13555)
@@ -34,6 +34,8 @@
public static String wf_HomeDirLabel;
public static String wf_JRELabel;
public static String wf_ConfigLabel;
+ public static String JBAS_version;
+ public static String JBEAP_version;
public static String rwf_Title;
public static String rwf_Explanation;
public static String rwf_BaseName;
@@ -42,7 +44,6 @@
public static String rwf_nameTextBlank;
public static String rwf_homeDirBlank;
public static String swf_Title;
- public static String swf_Description;
public static String swf_RuntimeInformation;
public static String swf_AuthorizationDescription;
public static String swf_Explanation;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-02-10
01:54:57 UTC (rev 13554)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-02-10
03:33:36 UTC (rev 13555)
@@ -6,15 +6,16 @@
wf_HomeDirLabel=Home Directory
wf_JRELabel=JRE
wf_ConfigLabel=Configuration
-rwf_Title=JBoss Runtime Wizard
+rwf_Title=Create a new JBoss Runtime
rwf_Explanation=A JBoss Server runtime references a JBoss installation directory.\nIt can
be used to set up classpaths for projects which depend on this runtime,\nas well as by a
"server" which will be able to start and stop instances of JBoss.
rwf_BaseName=JBoss _VERSION_ Runtime
rwf_NameInUse=Runtime name already in use
rwf_invalidDirectory=The home directory does not exist, is missing key files, or is of
the incorrect version.
rwf_nameTextBlank=The name field must not be blank
rwf_homeDirBlank=The directory field must not be blank
+JBAS_version=JBoss Application Server {0}
+JBEAP_version=JBoss Enterprise Application Platform {0}
swf_Title=Create a new JBoss Server
-swf_Description=
swf_RuntimeInformation=Runtime Information
swf_Explanation=A JBoss Server manages starting and stopping instances of JBoss. \nIt
manages command line arguments and keeps track of which modules have been deployed.
swf_Explanation2=If the runtime information below is incorrect, please press back,
Installed Runtimes..., \nand then Add to create a new runtime from a different location.
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-02-10
01:54:57 UTC (rev 13554)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-02-10
03:33:36 UTC (rev 13555)
@@ -37,6 +37,7 @@
import org.eclipse.jface.preference.PreferenceManager;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.window.Window;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.events.ModifyEvent;
@@ -111,12 +112,25 @@
fillWidgets();
// make modifications to parent
+ IRuntime r = (IRuntime) getTaskModel()
+ .getObject(TaskModel.TASK_RUNTIME);
+ String version = r.getRuntimeType().getVersion();
handle.setTitle(Messages.rwf_Title);
+ String description = NLS.bind(
+ isEAP() ? Messages.JBEAP_version : Messages.JBAS_version,
+ version);
handle.setImageDescriptor(getImageDescriptor());
+ handle.setDescription(description);
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
"org.jboss.ide.eclipse.as.doc.user.new_server_runtime");
return main;
}
+ protected boolean isEAP() {
+ IRuntime rt = (IRuntime) getTaskModel().getObject(
+ TaskModel.TASK_RUNTIME);
+ return
rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.");
+ }
+
protected ImageDescriptor getImageDescriptor() {
IRuntime rt = (IRuntime) getTaskModel().getObject(
TaskModel.TASK_RUNTIME);
@@ -130,7 +144,7 @@
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
else if (id.equals("org.jboss.ide.eclipse.as.runtime.50"))
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO; // TODO until we have a proper image
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_43_LOGO;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
@@ -138,6 +152,15 @@
private void fillWidgets() {
boolean canEdit = true;
+ // STUPID ECLIPSE BUG
https://bugs.eclipse.org/bugs/show_bug.cgi?id=263928
+ IRuntime r = (IRuntime) getTaskModel()
+ .getObject(TaskModel.TASK_RUNTIME);
+ String oldName = r.getName();
+ if( r.isWorkingCopy() ) {
+ String newName = oldName.replace("Enterprise Application Platform",
"EAP");
+ ((IRuntimeWorkingCopy)r).setName(newName);
+ }
+
IJBossServerRuntime rt = getRuntime();
if (rt != null) {
originalName = rt.getRuntime().getName();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-02-10
01:54:57 UTC (rev 13554)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-02-10
03:33:36 UTC (rev 13555)
@@ -26,6 +26,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -80,11 +81,23 @@
// make modifications to parent
handle.setTitle(Messages.swf_Title);
- handle.setDescription(Messages.swf_Description);
handle.setImageDescriptor (getImageDescriptor());
+ IRuntime r = (IRuntime) getTaskModel()
+ .getObject(TaskModel.TASK_RUNTIME);
+ String version = r.getRuntimeType().getVersion();
+ String description = NLS.bind(
+ isEAP() ? Messages.JBEAP_version : Messages.JBAS_version,
+ version);
+ handle.setDescription(description);
return main;
}
+
+ protected boolean isEAP() {
+ IRuntime rt = (IRuntime) getTaskModel().getObject(
+ TaskModel.TASK_RUNTIME);
+ return
rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.");
+ }
public ImageDescriptor getImageDescriptor() {
IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);