Author: rob.stryker(a)jboss.com
Date: 2009-05-06 05:58:45 -0400 (Wed, 06 May 2009)
New Revision: 15065
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-4275 - removing duplicate "name" section.
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2009-05-06
09:45:22 UTC (rev 15064)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2009-05-06
09:58:45 UTC (rev 15065)
@@ -19,6 +19,9 @@
public static String jboss;
public static String server;
public static String runtime;
+ public static String serverVersionName;
+ public static String serverName;
+ public static String serverCountName;
public static String runModeNotSupported;
public static String loadXMLDocumentFailed;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2009-05-06
09:45:22 UTC (rev 15064)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2009-05-06
09:58:45 UTC (rev 15065)
@@ -1,5 +1,8 @@
jboss=JBoss
server=Server
+serverVersionName=JBoss {0} Server
+serverName={0} Server
+serverCountName={0} ({1})
runtime=Runtime
securityException=Security Exception: {0}
JMXPoller=JMX Poller
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2009-05-06
09:45:22 UTC (rev 15064)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2009-05-06
09:58:45 UTC (rev 15065)
@@ -24,7 +24,6 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerPort;
import org.eclipse.wst.server.core.model.ServerDelegate;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.IWTPConstants;
@@ -40,6 +39,10 @@
}
public void setDefaults(IProgressMonitor monitor) {
+ IRuntime rt = getServer().getRuntime();
+ if( rt != null ) {
+ getServerWorkingCopy().setName(ServerUtil.getDefaultServerName(rt));
+ }
}
public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monitor)
throws CoreException {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2009-05-06
09:45:22 UTC (rev 15064)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2009-05-06
09:58:45 UTC (rev 15065)
@@ -13,12 +13,14 @@
import java.io.File;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -101,4 +103,31 @@
newTempAsGlobal.toFile().mkdirs();
}
}
+
+ public static IServer findServer(String name) {
+ IServer[] servers = ServerCore.getServers();
+ for( int i = 0; i < servers.length; i++ ) {
+ if (name.trim().equals(servers[i].getName()))
+ return servers[i];
+ }
+ return null;
+ }
+
+ public static String getDefaultServerName(IRuntime rt) {
+ String runtimeName = rt.getName();
+ String base = null;
+ if( runtimeName == null || runtimeName.equals("")) //$NON-NLS-1$
+ base = NLS.bind(Messages.serverVersionName, rt.getRuntimeType().getVersion());
+ else
+ base = NLS.bind(Messages.serverName, runtimeName);
+
+ if( ServerUtil.findServer(base) == null ) return base;
+ int i = 1;
+ while( ServerUtil.findServer(
+ NLS.bind(Messages.serverCountName, base, i)) != null )
+ i++;
+ return NLS.bind(Messages.serverCountName, base, i);
+ }
+
+
}
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-05-06
09:45:22 UTC (rev 15064)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-06
09:58:45 UTC (rev 15065)
@@ -60,15 +60,12 @@
*/
public class JBossServerWizardFragment extends WizardFragment {
private IWizardHandle handle;
- private String name;
- private Label nameLabel, serverExplanationLabel,
+ private Label serverExplanationLabel,
runtimeExplanationLabel;
private Label homeDirLabel, installedJRELabel, configLabel;
private Label homeValLabel, jreValLabel, configValLabel;
- private Composite nameComposite;
private Group runtimeGroup;
- private Text nameText;
public Composite createComposite(Composite parent, IWizardHandle handle) {
this.handle = handle;
@@ -76,7 +73,6 @@
main.setLayout(new FormLayout());
createExplanationLabel(main);
- createNameComposite(main);
createRuntimeGroup(main);
// make modifications to parent
@@ -122,71 +118,7 @@
serverExplanationLabel.setText(Messages.swf_Explanation);
}
- private void createNameComposite(Composite main) {
- // Create our name composite
- nameComposite = new Composite(main, SWT.NONE);
-
- FormData cData = new FormData();
- cData.left = new FormAttachment(0,5);
- cData.right = new FormAttachment(100,-5);
- cData.top = new FormAttachment(serverExplanationLabel, 10);
- nameComposite.setLayoutData(cData);
-
- nameComposite.setLayout(new FormLayout());
-
- // create internal widgets
- nameLabel = new Label(nameComposite, SWT.None);
- nameLabel.setText(Messages.wf_NameLabel);
-
- nameText = new Text(nameComposite, SWT.BORDER);
- name = getDefaultNameText();
- nameText.setText(name);
- nameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- name = nameText.getText();
- updateErrorMessage();
- }
- });
-
- // organize widgets inside composite
- FormData nameLabelData = new FormData();
- nameLabelData.left = new FormAttachment(0,0);
- nameLabel.setLayoutData(nameLabelData);
-
- FormData nameTextData = new FormData();
- nameTextData.left = new FormAttachment(0, 5);
- nameTextData.right = new FormAttachment(100, -5);
- nameTextData.top = new FormAttachment(nameLabel, 5);
- nameText.setLayoutData(nameTextData);
- }
-
- private String getDefaultNameText() {
- IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- String name = rt.getName();
- String base = null;
- if( name == null || name.equals(""))
- base = Messages.swf_BaseName.replace(Messages.wf_BaseNameVersionReplacement,
rt.getRuntimeType().getVersion());
- else if( name.endsWith(org.jboss.ide.eclipse.as.core.Messages.runtime))
- base = name.substring(0, name.indexOf(org.jboss.ide.eclipse.as.core.Messages.runtime))
+ org.jboss.ide.eclipse.as.core.Messages.server;
- else
- base = name + " " + org.jboss.ide.eclipse.as.core.Messages.server;
-
- if( findServer(base) == null ) return base;
- int i = 1;
- while( findServer(base + " (" + i + ")") != null )
- i++;
- return base + " (" + i + ")";
- }
- private IServer findServer(String name) {
- IServer[] servers = ServerCore.getServers();
- for( int i = 0; i < servers.length; i++ ) {
- if (name.trim().equals(servers[i].getName()))
- return servers[i];
- }
- return null;
- }
-
private void createRuntimeGroup(Composite main) {
runtimeGroup = new Group(main, SWT.NONE);
@@ -194,7 +126,7 @@
FormData groupData = new FormData();
groupData.left = new FormAttachment(0,5);
groupData.right = new FormAttachment(100, -5);
- groupData.top = new FormAttachment(nameComposite, 5);
+ groupData.top = new FormAttachment(serverExplanationLabel, 5);
runtimeGroup.setLayoutData(groupData);
runtimeGroup.setLayout(new GridLayout(2, false));
@@ -236,8 +168,6 @@
}
private String getErrorString() {
- if( findServer(name) != null )
- return Messages.swf_NameInUse;
return null;
}
@@ -245,8 +175,6 @@
public void enter() {
if(homeValLabel !=null && !homeValLabel.isDisposed()) {
IJBossServerRuntime srt = getRuntime();
- name = name == null ? getDefaultNameText() : name;
- nameText.setText(name);
homeValLabel.setText(srt.getRuntime().getLocation().toOSString());
configValLabel.setText(srt.getJBossConfiguration());
jreValLabel.setText(srt.getVM().getInstallLocation().getAbsolutePath() + "
(" + srt.getVM().getName() + ")");
@@ -260,13 +188,11 @@
public void performFinish(IProgressMonitor monitor) throws CoreException {
IServerWorkingCopy serverWC = (IServerWorkingCopy)
getTaskModel().getObject(TaskModel.TASK_SERVER);
- name = name == null ? getDefaultNameText() : name;
JBossServer jbs = (JBossServer)serverWC.loadAdapter(JBossServer.class, new
NullProgressMonitor());
jbs.setUsername("admin");
jbs.setPassword("admin");
jbs.setDeployLocationType(isAS5() ? IDeployableServer.DEPLOY_SERVER :
IDeployableServer.DEPLOY_METADATA);
serverWC.setRuntime((IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME));
- serverWC.setName(name);
serverWC.setServerConfiguration(null); // no inside jboss folder
IServer saved = serverWC.save(false, new NullProgressMonitor());