[jbosstools-commits] JBoss Tools SVN: r39163 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui and 2 other directories.

Author: rob.stryker(a)jboss.com Date: 2012-02-28 05:28:13 -0500 (Tue, 28 Feb 2012) New Revision: 39163 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-11071 and JBIDE-11055 to trunk Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-28 07:49:23 UTC (rev 39162) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-28 10:28:13 UTC (rev 39163) @@ -31,7 +31,6 @@ import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLEncoder; import java.util.Date; import org.eclipse.core.runtime.IPath; @@ -40,9 +39,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.equinox.security.storage.EncodingUtils; -import org.eclipse.equinox.security.storage.ISecurePreferences; -import org.eclipse.equinox.security.storage.SecurePreferencesFactory; import org.eclipse.equinox.security.storage.StorageException; import org.eclipse.jst.server.core.IWebModule; import org.eclipse.wst.server.core.IModule; @@ -252,7 +248,7 @@ // first class parameters public String getUsername() { - return getAttribute(SERVER_USERNAME, ""); //$NON-NLS-1$ + return getAttribute(SERVER_USERNAME, "admin"); //$NON-NLS-1$ } public void setUsername(String name) { setAttribute(SERVER_USERNAME, name); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2012-02-28 07:49:23 UTC (rev 39162) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2012-02-28 10:28:13 UTC (rev 39163) @@ -69,8 +69,8 @@ Label top = new Label(main, SWT.NONE); Label userLabel = new Label(main, SWT.NONE); Label passLabel = new Label(main, SWT.NONE); - final Text userText = new Text(main, SWT.DEFAULT); - final Text passText = new Text(main, SWT.DEFAULT); + final Text userText = new Text(main, SWT.SINGLE | SWT.BORDER); + final Text passText = new Text(main, SWT.SINGLE | SWT.BORDER | SWT.PASSWORD); userText.setEditable(true); passText.setEditable(true); final Button saveCredentials = new Button(main, SWT.CHECK); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2012-02-28 07:49:23 UTC (rev 39162) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2012-02-28 10:28:13 UTC (rev 39163) @@ -11,6 +11,7 @@ package org.jboss.ide.eclipse.as.ui.editor; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; @@ -68,12 +69,12 @@ Label username = toolkit.createLabel(composite, Messages.swf_Username); username.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); - String n = helper.getAttribute(IJBossToolingConstants.SERVER_USERNAME, ""); //$NON-NLS-1$ + String n = ServerConverter.getJBossServer(server.getOriginal()).getUsername(); String p = ServerConverter.getJBossServer(server.getOriginal()).getPassword(); nameText = toolkit.createText(composite, n); Label password = toolkit.createLabel(composite, Messages.swf_Password); password.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); - passText = toolkit.createText(composite, p); + passText = toolkit.createText(composite, p, SWT.SINGLE | SWT.PASSWORD); passwordString = p; d = new GridData(); d.grabExcessHorizontalSpace = true; d.widthHint = 100; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-02-28 07:49:23 UTC (rev 39162) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-02-28 10:28:13 UTC (rev 39163) @@ -186,13 +186,13 @@ class="org.jboss.ide.eclipse.as.ui.editor.ServerPasswordSection" id="org.jboss.ide.eclipse.as.ui.editor.passwordSection" insertionId="org.eclipse.wst.server.editor.overview.left" - order="10" + order="9" typeIds="%AllJBossServerTypes"/> <section class="org.jboss.ide.eclipse.as.ui.editor.ServerModeSection" id="org.jboss.ide.eclipse.as.ui.editor.serverModeSection" insertionId="org.eclipse.wst.server.editor.overview.left" - order="9" + order="10" typeIds="%AllJBTServerTypes"/> <!-- NEW_SERVER_ADAPTER Add the server editor sections for a new server above this line -->