JBoss Tools SVN: r38589 - in trunk: openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-10 04:14:33 -0500 (Fri, 10 Feb 2012)
New Revision: 38589
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferencevalue/StringsPreferenceValue.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
Log:
adding loading and saving of users and the password api
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferencevalue/StringsPreferenceValue.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferencevalue/StringsPreferenceValue.java 2012-02-10 08:29:21 UTC (rev 38588)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferencevalue/StringsPreferenceValue.java 2012-02-10 09:14:33 UTC (rev 38589)
@@ -165,9 +165,9 @@
* value in the given array at index x) and stores the preferences.
*/
public void store(String[] newValues) {
- String[] currentValues = get();
- overrideValues(newValues, currentValues);
- doStore(concatenate(currentValues));
+ //String[] currentValues = get();
+ //overrideValues(newValues, currentValues);
+ doStore(concatenate(newValues));
}
public void store() {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-10 08:29:21 UTC (rev 38588)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-10 09:14:33 UTC (rev 38589)
@@ -27,6 +27,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
+import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IUser;
@@ -49,7 +50,7 @@
public static final String ATTRIBUTE_DOMAIN = "org.jboss.tools.openshift.express.internal.core.behaviour.Domain";
public static final String ATTRIBUTE_USERNAME = "org.jboss.tools.openshift.express.internal.core.behaviour.Username";
// Legacy, not to be used
- public static final String ATTRIBUTE_PASSWORD = "org.jboss.tools.openshift.express.internal.core.behaviour.Password";
+ //public static final String ATTRIBUTE_PASSWORD = "org.jboss.tools.openshift.express.internal.core.behaviour.Password";
public static final String ATTRIBUTE_REMOTE_NAME = "org.jboss.tools.openshift.express.internal.core.behaviour.RemoteName";
public static final String ATTRIBUTE_REMOTE_NAME_DEFAULT = "origin";
@@ -128,24 +129,30 @@
return wc.save(false, new NullProgressMonitor());
}
- public static String getExpressPassword(IServerWorkingCopy server ) {
- return getExpressPassword(server.getOriginal());
- }
+// public static String getExpressPassword(IServerWorkingCopy server ) {
+// String username = getExpressUsername(server);
+// return UserModel.getDefault().getPasswordFromSecureStorage(username);
+// }
+//
+// public static String getExpressPassword(IServer server ) {
+// String username = getExpressUsername(server);
+// return UserModel.getDefault().getPasswordFromSecureStorage(username);
+//
+// // Can safely delete this if we have no need for backwards compat currently
+//// if( server == null )
+//// return null;
+//// String s = ServerUtil.getFromSecureStorage(server, ExpressServerUtils.ATTRIBUTE_PASSWORD);
+//// if( s == null )
+//// return server.getAttribute(ExpressServerUtils.ATTRIBUTE_PASSWORD, (String)null);
+//// return s;
+// }
+//
+// public static void setExpressPassword(IServerAttributes server, String val) throws CoreException {
+// String username = getExpressUsername(server);
+// UserModel.getDefault().setPasswordInSecureStorage(username, val);
+// }
- public static String getExpressPassword(IServer server ) {
- if( server == null )
- return null;
- String s = ServerUtil.getFromSecureStorage(server, ExpressServerUtils.ATTRIBUTE_PASSWORD);
- if( s == null )
- return server.getAttribute(ExpressServerUtils.ATTRIBUTE_PASSWORD, (String)null);
- return s;
- }
- public static void setExpressPassword(IServerAttributes server, String val) throws CoreException {
- ServerUtil.storeInSecureStorage(server, ExpressServerUtils.ATTRIBUTE_PASSWORD, val);
- }
-
-
public static boolean getIgnoresContextRoot(IServerAttributes server) {
return server.getAttribute(PREFERENCE_IGNORE_CONTEXT_ROOT, true);
}
@@ -239,7 +246,7 @@
ServerWorkingCopy wc = (ServerWorkingCopy)server.createWorkingCopy();
fillServerWithOpenShiftDetails(wc, host, username, domain, appName, appId, mode, remoteName);
IServer saved = wc.save(true, new NullProgressMonitor());
- ExpressServerUtils.setExpressPassword(wc, password);
+// ExpressServerUtils.setExpressPassword(wc, password);
return saved;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-02-10 08:29:21 UTC (rev 38588)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-02-10 09:14:33 UTC (rev 38589)
@@ -13,8 +13,11 @@
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue;
+import org.jboss.tools.common.ui.preferencevalue.StringsPreferenceValue;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.utils.OpenShiftPasswordStorageKey;
@@ -32,13 +35,16 @@
if( model == null )
model = new UserModel();
return model;
- }
+ }
-
/** The most recent user connected on OpenShift. */
private IUser recentUser = null;
private HashMap<String, IUser> allUsers = new HashMap<String,IUser>();
+ public UserModel() {
+ load();
+ }
+
/**
* Create a user for temporary external use
*
@@ -93,25 +99,52 @@
* Load the user list from preferences and secure storage
*/
public void load() {
- // TODO
+ StringsPreferenceValue pref = new StringsPreferenceValue('|', RHLOGIN_LIST_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
+ String[] users = pref.get();
+ for( int i = 0; i < users.length; i++ ) {
+ try {
+ String password = getPasswordFromSecureStorage(users[i]);
+ IUser u = createUser(users[i], password);
+ addUser(u);
+ } catch(OpenShiftException ose ) {
+ // TODO
+ } catch( IOException ioe) {
+ // TODO
+ }
+ }
}
/**
* Save the user list to preferences and secure storage
*/
public void save() {
- // TODO
- // save the passwords in secure storage, save the username list somewhere else
+ // passwords are already in secure storage, save the username list somewhere else
+ Set<String> set = allUsers.keySet();
+ String[] userList = (String[]) set.toArray(new String[set.size()]);
+ StringsPreferenceValue pref = new StringsPreferenceValue('|', RHLOGIN_LIST_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
+ pref.store(userList);
+
+ Iterator<IUser> i = allUsers.values().iterator();
+ IUser tmp;
+ while(i.hasNext()) {
+ tmp = i.next();
+ try {
+ setPasswordInSecureStorage(tmp.getRhlogin(), tmp.getPassword());
+ } catch(OpenShiftException ose ) {
+ // TODO log
+ }
+ }
}
- private static final String RHLOGIN_PREFS_KEY = "org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardModel_RHLOGIN";
+ private static final String RECENT_RHLOGIN_PREFS_KEY = "org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardModel_RHLOGIN";
+ private static final String RHLOGIN_LIST_PREFS_KEY = "org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardModel_RHLOGIN_LIST";
/**
* Get the username stored in preferences as most recently used
* @return
*/
public String getDefaultUsername() {
- StringPreferenceValue pref = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
+ StringPreferenceValue pref = new StringPreferenceValue(RECENT_RHLOGIN_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
String rhLogin = null;
rhLogin = pref.get();
if (rhLogin == null || rhLogin.length() == 0) {
@@ -131,7 +164,7 @@
*/
public boolean setDefaultUsername(String rhLogin) {
String prev = getDefaultUsername();
- StringPreferenceValue preference = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
+ StringPreferenceValue preference = new StringPreferenceValue(RECENT_RHLOGIN_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
if (rhLogin != null && !rhLogin.equals(prev)) {
preference.store(rhLogin);
return true;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-02-10 08:29:21 UTC (rev 38588)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-02-10 09:14:33 UTC (rev 38589)
@@ -17,7 +17,6 @@
import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
-import com.openshift.express.client.User;
/**
* The activator class controls the plug-in life cycle
@@ -56,6 +55,7 @@
* )
*/
public void stop(BundleContext context) throws Exception {
+ UserModel.getDefault().save();
plugin = null;
super.stop(context);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java 2012-02-10 08:29:21 UTC (rev 38588)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java 2012-02-10 09:14:33 UTC (rev 38589)
@@ -75,7 +75,6 @@
@Override
public void performFinish(IProgressMonitor monitor) throws CoreException {
- ExpressServerUtils.setExpressPassword(wrapped.getServer(), composite.getPassword());
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-10 08:29:21 UTC (rev 38588)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-10 09:14:33 UTC (rev 38589)
@@ -38,7 +38,6 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
import org.jboss.ide.eclipse.as.ui.editor.ServerWorkingCopyPropertyComboCommand;
@@ -63,8 +62,10 @@
protected IServerModeUICallback callback;
private ModifyListener nameModifyListener, remoteModifyListener,
- passModifyListener, appModifyListener, deployProjectModifyListener;
- protected Text userText, passText, remoteText;
+ appModifyListener, deployProjectModifyListener;
+// private ModifyListener passModifyListener;
+ protected Text userText, remoteText;
+// protected Text passText;
protected Combo appNameCombo, deployProjectCombo;
protected Button verifyButton;
protected boolean showVerify;
@@ -100,8 +101,8 @@
userText = new Text(composite, SWT.SINGLE | SWT.BORDER);
GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(userText);
Label passLabel = new Label(composite, SWT.NONE);
- passText = new Text(composite, SWT.PASSWORD | SWT.BORDER);
- GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(passText);
+// passText = new Text(composite, SWT.PASSWORD | SWT.BORDER);
+// GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(passText);
if( mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE) ) {
Label appNameLabel = new Label(composite, SWT.NONE);
@@ -133,10 +134,9 @@
remoteText.setText(IOpenShiftWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT);
String n = ExpressServerUtils.getExpressUsername(server);
- String p = ExpressServerUtils.getExpressPassword(server.getOriginal());
String remote = ExpressServerUtils.getExpressRemoteName(server);
if( n != null ) userText.setText(n);
- if( p != null ) passText.setText(p);
+// if( p != null ) passText.setText(p);
if( remote != null ) remoteText.setText(remote);
if( showVerify ) {
@@ -174,13 +174,13 @@
};
userText.addModifyListener(nameModifyListener);
- passModifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- //pass = passText.getText();
- callback.execute(new SetPassCommand(server));
- }
- };
- passText.addModifyListener(passModifyListener);
+// passModifyListener = new ModifyListener() {
+// public void modifyText(ModifyEvent e) {
+// //pass = passText.getText();
+// callback.execute(new SetPassCommand(server));
+// }
+// };
+// passText.addModifyListener(passModifyListener);
remoteModifyListener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -283,24 +283,24 @@
}
}
- public class SetPassCommand extends ServerWorkingCopyPropertyCommand {
- public SetPassCommand(IServerWorkingCopy server) {
- super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(),
- IJBossToolingConstants.SERVER_PASSWORD, passModifyListener);
- oldVal = passText.getText();
- }
-
- public void execute() {
- pass = newVal;
- }
-
- public void undo() {
- pass = oldVal;
- text.removeModifyListener(listener);
- text.setText(oldVal);
- text.addModifyListener(listener);
- }
- }
+// public class SetPassCommand extends ServerWorkingCopyPropertyCommand {
+// public SetPassCommand(IServerWorkingCopy server) {
+// super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(),
+// IJBossToolingConstants.SERVER_PASSWORD, passModifyListener);
+// oldVal = passText.getText();
+// }
+//
+// public void execute() {
+// pass = newVal;
+// }
+//
+// public void undo() {
+// pass = oldVal;
+// text.removeModifyListener(listener);
+// text.setText(oldVal);
+// text.addModifyListener(listener);
+// }
+// }
private Runnable getVerifyingCredentialsJob(final CredentialsWizardPageModel model) {
return new Runnable() {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-02-10 08:29:21 UTC (rev 38588)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-02-10 09:14:33 UTC (rev 38589)
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.behaviour;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -55,12 +54,12 @@
* @param monitor the progress monitor for the save operation.
*/
public void doSave(IProgressMonitor monitor) {
- try {
- ExpressServerUtils.setExpressPassword(server.getOriginal(), details.getPassword());
- monitor.worked(100);
- } catch( CoreException ce ) {
- // TODO
- }
+// try {
+// ExpressServerUtils.setExpressPassword(server.getOriginal(), details.getPassword());
+// monitor.worked(100);
+// } catch( CoreException ce ) {
+// // TODO
+// }
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-02-10 08:29:21 UTC (rev 38588)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-02-10 09:14:33 UTC (rev 38589)
@@ -65,6 +65,7 @@
}
public void performFinish(IProgressMonitor monitor) throws CoreException {
- ExpressServerUtils.setExpressPassword(callback.getServer(), composite.getPassword());
+ super.performFinish(monitor);
+// ExpressServerUtils.setExpressPassword(callback.getServer(), composite.getPassword());
}
}
14 years, 1 month
JBoss Tools SVN: r38588 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-10 03:29:21 -0500 (Fri, 10 Feb 2012)
New Revision: 38588
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogWorker.java
Log:
Tail server shows nothing if tail fails. User gets no feedback. Fixed
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java 2012-02-10 01:55:27 UTC (rev 38587)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java 2012-02-10 08:29:21 UTC (rev 38588)
@@ -128,6 +128,8 @@
thread.start();
} catch (Exception e) {
Logger.error("Failed to retrieve remote server logs", e);
+ console.newMessageStream().println("Failed to retrieve remote server logs: " + e.getMessage());
+ console.newMessageStream().println("Please make sure your ssh key is added to your ssh preferences");
}
return Status.OK_STATUS;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogWorker.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogWorker.java 2012-02-10 01:55:27 UTC (rev 38587)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogWorker.java 2012-02-10 08:29:21 UTC (rev 38588)
@@ -55,6 +55,7 @@
} catch (Throwable e) {
org.jboss.tools.openshift.express.internal.ui.utils.Logger.error(
"Error while receiving the remote server log", e);
+ console.newMessageStream().println("Error while receiving the remote server log: " + e.getMessage());
} finally {
}
14 years, 1 month
JBoss Tools SVN: r38587 - trunk/maven/tests/org.jboss.tools.maven.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-09 20:55:27 -0500 (Thu, 09 Feb 2012)
New Revision: 38587
Modified:
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
Log:
fixed skip property value
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-02-10 00:46:23 UTC (rev 38586)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-02-10 01:55:27 UTC (rev 38587)
@@ -22,7 +22,7 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
- <skip>{swtbot.test.skip}</skip>
+ <skip>${swtbot.test.skip}</skip>
<testSuite>org.jboss.tools.maven.ui.bot.test</testSuite>
<testClass>org.jboss.tools.maven.ui.bot.test.MavenAllBotTests</testClass>
<dependencies>
14 years, 2 months
JBoss Tools SVN: r38586 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-09 19:46:23 -0500 (Thu, 09 Feb 2012)
New Revision: 38586
Modified:
trunk/build/parent/pom.xml
Log:
moved target platform repository definition to default profile which is activated by default
adde local.site profile activation rules. it is activated by BULD_NUMBER property
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-02-10 00:44:18 UTC (rev 38585)
+++ trunk/build/parent/pom.xml 2012-02-10 00:46:23 UTC (rev 38586)
@@ -465,6 +465,11 @@
without needing to use a local.site file -->
<profile>
<id>local.site</id>
+ <activation>
+ <property>
+ <name>BUILD_NUMBER</name>
+ </property>
+ </activation>
<repositories>
<repository>
<id>local.site</id>
@@ -762,31 +767,29 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <!-- Single repo containing contents of unified.target, but without using
+ the target file -->
+ <repository>
+ <id>jbosstools-target-site</id>
+ <url>${jbosstools-target-site}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
</profiles>
- <repositories>
-
- <!-- Single repo containing contents of unified.target, but without using
- the target file -->
- <repository>
- <id>jbosstools-target-site</id>
- <url>${jbosstools-target-site}</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <!-- do not needed because parent pom is not required anymore -->
- <!-- repository> <id>jboss-public-repository-group</id> <name>JBoss Public
- Repository Group</name> <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy>
- </releases> <snapshots> <enabled>true</enabled> <updatePolicy>never</updatePolicy>
- </snapshots> </repository -->
- </repositories>
-
<!-- Additional m2 repos to resolve things like org.eclipse.tycho:tycho-maven-plugin:0.13.0-SNAPSHOT -->
<pluginRepositories>
<pluginRepository>
14 years, 2 months
JBoss Tools SVN: r38585 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: resources/tck/tests/jbt/lookup/qualifier and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-09 19:44:18 -0500 (Thu, 09 Feb 2012)
New Revision: 38585
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
Log:
JBIDE-10791
https://issues.jboss.org/browse/JBIDE-10791
Test for qualifier with default values set by simple and complex expressions.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java 2012-02-10 00:44:18 UTC (rev 38585)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.jbt.lookup.qualifier;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+public class MyBean {
+
+ @Produces
+ @QualifierWithDefaults
+ String p;
+
+ @Inject
+ @QualifierWithDefaults
+ String i;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java 2012-02-10 00:44:18 UTC (rev 38585)
@@ -0,0 +1,39 @@
+package org.jboss.jsr299.tck.tests.jbt.lookup.qualifier;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface QualifierWithDefaults {
+
+ String stringValue() default "";
+ boolean booleanValue() default false;
+ char charValue() default 'c';
+ int intValue() default 0;
+ long longValue() default 22l;
+ short shortValue() default 5;
+ float floatValue() default 5.0f;
+ double doubleValue() default 3.0d;
+
+ String stringValue2() default "a" + "b";
+ boolean booleanValue2() default false & true;
+ char charValue2() default (char)7;
+ int intValue2() default 1 + 2;
+ long longValue2() default 2 + 3;
+ short shortValue2() default (short)5;
+ float floatValue2() default (float)5.0;
+ double doubleValue2() default 3.0d + 1;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2012-02-10 00:37:10 UTC (rev 38584)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2012-02-10 00:44:18 UTC (rev 38585)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.util.List;
import java.util.Set;
import org.jboss.tools.cdi.core.CDIUtil;
@@ -17,6 +18,8 @@
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
/**
@@ -92,4 +95,11 @@
resolved = cdiProject.getBeans(false, injectionPoint);
assertFalse(resolved.isEmpty());
}
+
+ public void testDefaultValuesInQualifierProperties() {
+ IInjectionPoint injectionPoint = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/lookup/qualifier/MyBean.java", "i");
+ assertNotNull(injectionPoint);
+ Set<IBean> resolved = cdiProject.getBeans(false, injectionPoint);
+ assertFalse(resolved.isEmpty());
+ }
}
\ No newline at end of file
14 years, 2 months
JBoss Tools SVN: r38584 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-02-09 19:37:10 -0500 (Thu, 09 Feb 2012)
New Revision: 38584
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-02-10 00:35:35 UTC (rev 38583)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-02-10 00:37:10 UTC (rev 38584)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>6</pubsnumber>
+<pubsnumber>7</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
14 years, 2 months
JBoss Tools SVN: r38583 - in trunk/documentation/guides/GettingStartedGuide/en-US: images/getting_started and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-02-09 19:35:35 -0500 (Thu, 09 Feb 2012)
New Revision: 38583
Added:
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_16.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_17.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_18.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_19.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_20.png
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml
Log:
updated with new jboss central software and update information
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2012-02-09 23:55:33 UTC (rev 38582)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2012-02-10 00:35:35 UTC (rev 38583)
@@ -326,13 +326,71 @@
</inlinemediaobject> button at the bottom left of the tab window. A screen will then appear offering you the option of deselecting a part of the component if you wish.
</para>
<figure>
- <title>Software/Update tab</title>
+ <title>Component selection</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/getting_started/jboss_central_15.png" scale="90"/>
</imageobject>
</mediaobject>
</figure>
+ <para>
+ You will then be asked to confirm the selection of components to install. To accept the selection press the <guibutton>Next</guibutton> button. You can change the components by pressing the <guibutton>Back</guibutton> button.
+ </para>
+ <figure>
+ <title>Component verification</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/getting_started/jboss_central_16.png" scale="90"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ After pressing the <guibutton>Next</guibutton> button you will need to <guilabel>accept the terms of the license agreement</guilabel> for the associated software being installed. To do this select the corresponding radio button.
+ </para>
+ <para>
+ Click <guibutton>Finish</guibutton> to begin installation.
+ </para>
+ <figure>
+ <title>Licenses review</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/getting_started/jboss_central_17.png" scale="90"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ As the installation process takes place you can choose to have further details displayed or run the installation in the background.
+ </para>
+ <figure>
+ <title>Licenses review</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/getting_started/jboss_central_18.png" scale="90"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ After the software has been downloaded, you will be asked to verify the installation of the components if the contents are unsigned. Install unsigned third-party components with discretion.
+ </para>
+ <figure>
+ <title>Installing unsigned content</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/getting_started/jboss_central_19.png" scale="90"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Once installation is complete, restart JBoss Developer Studio by pressing the <guibutton>Restart Now</guibutton> button that appears.
+ </para>
+ <figure>
+ <title> </title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/getting_started/jboss_central_20.png" scale="90"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</section>
</section>
<section id="JBoss_Perspective">
Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_16.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_16.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_17.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_17.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_18.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_18.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_19.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_19.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_20.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/jboss_central_20.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 2 months
JBoss Tools SVN: r38582 - trunk/common.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-09 18:55:33 -0500 (Thu, 09 Feb 2012)
New Revision: 38582
Modified:
trunk/common/pom.xml
Log:
Added direct references to tests nightly update sites, so nightly composite not needed anymore during the build and that means buld doesn't download all metadata for whole tools
Modified: trunk/common/pom.xml
===================================================================
--- trunk/common/pom.xml 2012-02-09 22:49:21 UTC (rev 38581)
+++ trunk/common/pom.xml 2012-02-09 23:55:33 UTC (rev 38582)
@@ -19,5 +19,19 @@
<module>site</module>
<module>tests</module>
</modules>
+ <!-- do not need all metadata to compile common component -->
+ <repositories>
+ <repository>
+ <id>jbosstools-tests-nightly-repo</id>
+ <url>http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.3_trunk....</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
</project>
14 years, 2 months
JBoss Tools SVN: r38581 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-09 17:49:21 -0500 (Thu, 09 Feb 2012)
New Revision: 38581
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectAdoptOperation.java
Log:
JBIDE-10806
https://issues.jboss.org/browse/JBIDE-10806
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectAdoptOperation.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectAdoptOperation.java 2012-02-09 22:48:30 UTC (rev 38580)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectAdoptOperation.java 2012-02-09 22:49:21 UTC (rev 38581)
@@ -29,8 +29,10 @@
import org.jboss.tools.jsf.project.JSFNature;
import org.jboss.tools.jsf.web.JSFTemplate;
import org.jboss.tools.jsf.web.helpers.context.AdoptJSFProjectFinisher;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.context.IImportWebProjectContext;
import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.internal.KbBuilder;
import org.jboss.tools.jst.web.ui.operation.WebProjectAdoptOperation;
public class JSFProjectAdoptOperation extends WebProjectAdoptOperation {
@@ -102,7 +104,7 @@
}
}
try {
- EclipseResourceUtil.addNatureToProject(getProject(), IKbProject.NATURE_ID);
+ WebModelPlugin.addNatureToProjectWithValidationSupport(getProject(), KbBuilder.BUILDER_ID, IKbProject.NATURE_ID);
} catch (CoreException e) {
JSFModelPlugin.getPluginLog().logError(e);
}
14 years, 2 months
JBoss Tools SVN: r38580 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-09 17:48:30 -0500 (Thu, 09 Feb 2012)
New Revision: 38580
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
Log:
[JBIDE-10844] moved signup text/link to the top, made it left aligned with the labels
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-02-09 20:56:32 UTC (rev 38579)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-02-09 22:48:30 UTC (rev 38580)
@@ -49,7 +49,7 @@
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils;
/**
- * @author Andr� Dietisheim
+ * @author Andre Dietisheim
* @author Xavier Coulon
*/
public class CredentialsWizardPage extends AbstractOpenShiftWizardPage {
@@ -70,11 +70,23 @@
protected void doCreateControls(Composite container, DataBindingContext dbc) {
GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).applyTo(container);
+ Link signupLink = new Link(container, SWT.WRAP);
+ signupLink.setText("If you do not have an account on OpenShift Express, please sign up <a>here</a>.");
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).span(2, 1).applyTo(signupLink);
+ signupLink.addSelectionListener(onSignupLinkClicked());
+
+ Label fillerLabel = new Label(container, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .span(2, 1).hint(SWT.DEFAULT, 6).applyTo(fillerLabel);
+
Label rhLoginLabel = new Label(container, SWT.NONE);
rhLoginLabel.setText("&Username");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(rhLoginLabel);
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(rhLoginLabel);
rhLoginText = new Text(container, SWT.BORDER);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(rhLoginText);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(rhLoginText);
UIUtils.selectAllOnFocus(rhLoginText);
final IObservableValue rhLoginObservable = BeanProperties.value(CredentialsWizardPageModel.PROPERTY_RHLOGIN)
.observe(pageModel);
@@ -86,34 +98,32 @@
passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(passwordText);
UIUtils.selectAllOnFocus(passwordText);
- final IObservableValue passwordModelObservable = BeanProperties.value(CredentialsWizardPageModel.PROPERTY_PASSWORD)
+ final IObservableValue passwordModelObservable = BeanProperties.value(
+ CredentialsWizardPageModel.PROPERTY_PASSWORD)
.observe(pageModel);
final ISWTObservableValue passwordTextObservable = WidgetProperties.text(SWT.Modify).observe(passwordText);
dbc.bindValue(passwordTextObservable, passwordModelObservable);
-
+
IObservableValue credentialsStatusObservable = BeanProperties.value(
CredentialsWizardPageModel.PROPERTY_CREDENTIALS_STATUS).observe(pageModel);
dbc.addValidationStatusProvider(new CredentialsInputValidator(rhLoginObservable,
passwordModelObservable));
- final CredentialsStatusValidator credentialsStatusValidator = new CredentialsStatusValidator(credentialsStatusObservable, passwordTextObservable);
+ final CredentialsStatusValidator credentialsStatusValidator = new CredentialsStatusValidator(
+ credentialsStatusObservable, passwordTextObservable);
dbc.addValidationStatusProvider(credentialsStatusValidator);
ControlDecorationSupport.create(credentialsStatusValidator, SWT.LEFT | SWT.TOP);
- new Label(container, SWT.NONE); // filler to align the checkbox under the text fields
+ new Label(container, SWT.NONE); // filler to align the checkbox under
+ // the text fields
Button rememberPasswordCheckBox = new Button(container, SWT.CHECK);
rememberPasswordCheckBox.setText("Save password (could trigger secure storage login)");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(rememberPasswordCheckBox);
- final IObservableValue rememberPasswordModelObservable = BeanProperties.value(CredentialsWizardPageModel.PROPERTY_REMEMBER_PASSWORD)
+ final IObservableValue rememberPasswordModelObservable = BeanProperties.value(
+ CredentialsWizardPageModel.PROPERTY_REMEMBER_PASSWORD)
.observe(pageModel);
- final ISWTObservableValue rememberPasswordCheckBoxObservable = WidgetProperties.selection().observe(rememberPasswordCheckBox);
+ final ISWTObservableValue rememberPasswordCheckBoxObservable = WidgetProperties.selection().observe(
+ rememberPasswordCheckBox);
dbc.bindValue(rememberPasswordCheckBoxObservable, rememberPasswordModelObservable);
-
-
-
- Link signupLink = new Link(container, SWT.WRAP);
- signupLink.setText("If you don't have an account on OpenShift, please sign up <a>here</a>.");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).span(2, 1).hint(SWT.DEFAULT, 30).applyTo(signupLink);
- signupLink.addSelectionListener(onSignupLinkClicked());
}
protected SelectionAdapter onSignupLinkClicked() {
@@ -194,7 +204,8 @@
@Override
protected IStatus validate() {
- // set the wizard page status to OK as soon as a user types something..
+ // set the wizard page status to OK as soon as a user types
+ // something..
final String rhLoginValue = (String) rhLoginObservable.getValue();
final String passwordValue = (String) passwordObservable.getValue();
if (rhLoginValue != null && !rhLoginValue.isEmpty() && passwordValue != null && !passwordValue.isEmpty()) {
@@ -209,8 +220,9 @@
private final IObservableValue credentialsStatusObservable;
private final IObservableValue passwordTextObservable;
-
- public CredentialsStatusValidator(IObservableValue credentialsStatusObservable, IObservableValue passwordTextObservable) {
+
+ public CredentialsStatusValidator(IObservableValue credentialsStatusObservable,
+ IObservableValue passwordTextObservable) {
this.credentialsStatusObservable = credentialsStatusObservable;
this.passwordTextObservable = passwordTextObservable;
}
@@ -226,8 +238,11 @@
return ValidationStatus.ok();
}
- /* (non-Javadoc)
- * @see org.eclipse.core.databinding.validation.MultiValidator#getTargets()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.core.databinding.validation.MultiValidator#getTargets()
*/
@Override
public IObservableList getTargets() {
@@ -235,8 +250,7 @@
targets.add(passwordTextObservable);
return targets;
}
-
-
+
}
}
14 years, 2 months