JBoss Tools SVN: r40301 - trunk/flow/features/org.jboss.tools.flow.common.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-18 15:01:57 -0400 (Wed, 18 Apr 2012)
New Revision: 40301
Modified:
trunk/flow/features/org.jboss.tools.flow.common.feature/build.properties
Log:
JBIDE-11347 fix features' build.properties files so that feature.properties is correctly read
Modified: trunk/flow/features/org.jboss.tools.flow.common.feature/build.properties
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.feature/build.properties 2012-04-18 19:01:50 UTC (rev 40300)
+++ trunk/flow/features/org.jboss.tools.flow.common.feature/build.properties 2012-04-18 19:01:57 UTC (rev 40301)
@@ -12,5 +12,6 @@
# Red Hat - initial API and implementation
###############################################################################
-bin.includes = feature.*,\
+bin.includes = feature.xml,\
+ feature.properties,\
license.html
13 years, 11 months
JBoss Tools SVN: r40300 - in trunk/jbpm/features: org.jboss.tools.jbpm.common.feature and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-18 15:01:50 -0400 (Wed, 18 Apr 2012)
New Revision: 40300
Modified:
trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.test.feature/build.properties
Log:
JBIDE-11347 fix features' build.properties files so that feature.properties is correctly read
Modified: trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/build.properties 2012-04-18 18:51:23 UTC (rev 40299)
+++ trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/build.properties 2012-04-18 19:01:50 UTC (rev 40300)
@@ -12,5 +12,6 @@
# Red Hat - initial API and implementation
###############################################################################
-bin.includes = feature.*,\
+bin.includes = feature.xml,\
+ feature.properties,\
license.html
Modified: trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/build.properties 2012-04-18 18:51:23 UTC (rev 40299)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/build.properties 2012-04-18 19:01:50 UTC (rev 40300)
@@ -12,5 +12,6 @@
# Red Hat - initial API and implementation
###############################################################################
-bin.includes = feature.*,\
+bin.includes = feature.xml,\
+ feature.properties,\
license.html
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.feature/build.properties 2012-04-18 18:51:23 UTC (rev 40299)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.feature/build.properties 2012-04-18 19:01:50 UTC (rev 40300)
@@ -1,2 +1,3 @@
-bin.includes = feature.*,\
- license.html
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/build.properties 2012-04-18 18:51:23 UTC (rev 40299)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/build.properties 2012-04-18 19:01:50 UTC (rev 40300)
@@ -1,2 +1,3 @@
bin.includes = feature.xml,\
- feature.properties
+ feature.properties,\
+ license.html
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.feature/build.properties 2012-04-18 18:51:23 UTC (rev 40299)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.feature/build.properties 2012-04-18 19:01:50 UTC (rev 40300)
@@ -1,2 +1,3 @@
-bin.includes = feature.*,\
- license.html
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.test.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.test.feature/build.properties 2012-04-18 18:51:23 UTC (rev 40299)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.test.feature/build.properties 2012-04-18 19:01:50 UTC (rev 40300)
@@ -1,3 +1,4 @@
bin.includes = feature.xml,\
- feature.properties
+ feature.properties,\
+ license.html
13 years, 11 months
JBoss Tools SVN: r40299 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-18 14:51:23 -0400 (Wed, 18 Apr 2012)
New Revision: 40299
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties
Log:
https://issues.jboss.org/browse/JBIDE-11267 remote config UI for as7
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-04-18 18:31:11 UTC (rev 40298)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-04-18 18:51:23 UTC (rev 40299)
@@ -19,6 +19,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.ILaunchConfigConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.LocalJBoss7ServerRuntime;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
@@ -76,6 +77,9 @@
IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
null, "0.0.0.0");
}
+ programArguments = ArgsUtil.setArg(programArguments, null,
+ IJBossRuntimeConstants.JB7_SERVER_CONFIG_ARG,
+ ((LocalJBoss7ServerRuntime)jbossRuntime).getConfigurationFile());
String vmArguments = getDefaultVMArguments(jbossServer, jbossRuntime);
String jar = getJar(jbossServer, jbossRuntime);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java 2012-04-18 18:31:11 UTC (rev 40298)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java 2012-04-18 18:51:23 UTC (rev 40299)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.ui;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -19,6 +22,9 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.server.core.IRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.LocalJBoss7ServerRuntime;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
import org.jboss.ide.eclipse.as.rse.ui.RSEDeploymentPreferenceUI.RSEDeploymentPreferenceComposite;
import org.jboss.ide.eclipse.as.ui.UIUtil;
@@ -30,6 +36,9 @@
private Text rseServerHome;
private Button rseBrowse;
+
+ private Text rseConfigFileText;
+ private Button rseConfigFileBrowse;
public JBoss7RSEDeploymentPrefComposite(Composite parent, int style,
IServerModeUICallback callback) {
@@ -38,18 +47,18 @@
protected void createRSEWidgets(Composite child) {
Label serverHomeLabel = new Label(this, SWT.NONE);
- serverHomeLabel.setText("Remote Server Home: ");
+ serverHomeLabel.setText(RSEUIMessages.REMOTE_SERVER_HOME_LABEL);
rseBrowse = new Button(this, SWT.NONE);
- rseBrowse.setText("Browse...");
+ rseBrowse.setText(RSEUIMessages.BROWSE);
rseBrowse.setLayoutData(UIUtil.createFormData2(child, 5, null,
0, null, 0, 100, -5));
rseBrowse.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- browseClicked2();
+ remoteHomeBrowseClicked();
}
public void widgetDefaultSelected(SelectionEvent e) {
- browseClicked2();
+ remoteHomeBrowseClicked();
}
});
rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER);
@@ -64,7 +73,36 @@
serverHomeChanged();
}
});
- }
+
+
+ Label serverConfigLabel = new Label(this, SWT.NONE);
+ serverConfigLabel.setText(RSEUIMessages.REMOTE_CONFIG_FILE_LABEL);
+ rseConfigFileBrowse = new Button(this, SWT.NONE);
+ rseConfigFileBrowse.setText(RSEUIMessages.BROWSE);
+ rseConfigFileBrowse.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null,
+ 0, null, 0, 100, -5));
+ rseConfigFileBrowse.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ remoteConfigBrowseClicked();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ remoteConfigBrowseClicked();
+ }
+ });
+ rseConfigFileText = new Text(this, SWT.SINGLE | SWT.BORDER);
+ serverConfigLabel.setLayoutData(UIUtil.createFormData2(rseServerHome, 7,
+ null, 0, 0, 10, null, 0));
+ rseConfigFileText.setLayoutData(UIUtil.createFormData2(rseServerHome, 5,
+ null, 0, serverConfigLabel, 5, rseConfigFileBrowse, -5));
+ rseConfigFileText.setText(callback.getServer().getAttribute(
+ RSEUtils.RSE_SERVER_CONFIG, LocalJBoss7ServerRuntime.CONFIG_FILE_DEFAULT));
+ rseConfigFileText.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ configFileChanged();
+ }
+ });
+}
protected void serverHomeChanged() {
if( !isUpdatingFromModelChange()) {
String safeString = callback.getRuntime() != null ? callback.getRuntime().getLocation() != null ?
@@ -74,11 +112,35 @@
safeString, RSEUIMessages.CHANGE_REMOTE_SERVER_HOME));
}
}
- protected void browseClicked2() {
- String browseVal = browseClicked3(rseServerHome.getShell());
+
+ protected void configFileChanged() {
+ if( !isUpdatingFromModelChange()) {
+ IRuntime rt = callback.getRuntime();
+ LocalJBoss7ServerRuntime jb7srt = rt == null ? null : (LocalJBoss7ServerRuntime)rt.loadAdapter(LocalJBoss7ServerRuntime.class, null);
+ String safeString = jb7srt == null ? "" : jb7srt.getConfigurationFile();
+ callback.execute(new ChangeServerPropertyCommand(
+ callback.getServer(), RSEUtils.RSE_SERVER_CONFIG, rseConfigFileText.getText(),
+ safeString, RSEUIMessages.CHANGE_REMOTE_CONFIG_FILE));
+ }
+ }
+
+ protected void remoteHomeBrowseClicked() {
+ String home = rseServerHome.getText() == null ? "" : rseServerHome.getText();
+ String browseVal = RSEDeploymentPreferenceUI.browseClicked4(rseServerHome.getShell(), combo.getHost(), home);
if (browseVal != null) {
rseServerHome.setText(browseVal);
serverHomeChanged();
}
}
+ protected void remoteConfigBrowseClicked() {
+ IPath home = new Path(rseServerHome.getText());
+ IPath configFolder = home.append(IJBossRuntimeResourceConstants.AS7_STANDALONE)
+ .append(IJBossRuntimeResourceConstants.CONFIGURATION);
+ IPath configFile = configFolder.append(rseConfigFileText.getText());
+ String browseVal = RSEDeploymentPreferenceUI.browseClicked4(rseServerHome.getShell(), combo.getHost(), configFile.toString());
+ if (browseVal != null) {
+ rseConfigFileText.setText(new Path(browseVal).lastSegment());
+ configFileChanged();
+ }
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-04-18 18:31:11 UTC (rev 40298)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-04-18 18:51:23 UTC (rev 40299)
@@ -28,8 +28,11 @@
import org.eclipse.rse.core.events.ISystemModelChangeListener;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.files.IHostFile;
+import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
+import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.ui.wizards.newconnection.RSEMainNewConnectionWizard;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -64,7 +67,6 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
-import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
@@ -442,13 +444,25 @@
}
public static String browseClicked4(Shell s, IHost host) {
+ return browseClicked4(s,host,null);
+ }
+
+ public static String browseClicked4(Shell s, IHost host, String path) {
SystemRemoteFileDialog d = new SystemRemoteFileDialog(
s, RSEUIMessages.BROWSE_REMOTE_SYSTEM, host);
+ try {
+ IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(host);
+ IRemoteFile rootFolder = ss.getRemoteFileObject(path, new NullProgressMonitor());
+ d.setPreSelection(rootFolder);
+ } catch(SystemMessageException sme) {
+ // Ignore
+ }
+
if( d.open() == Dialog.OK) {
Object o = d.getOutputObject();
if( o instanceof IRemoteFile ) {
- String path = ((IRemoteFile)o).getAbsolutePath();
- return path;
+ String path2 = ((IRemoteFile)o).getAbsolutePath();
+ return path2;
}
}
return null;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.java 2012-04-18 18:31:11 UTC (rev 40298)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.java 2012-04-18 18:51:23 UTC (rev 40299)
@@ -4,6 +4,7 @@
public class RSEUIMessages {
private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.rse.ui.RSEUIMessages"; //$NON-NLS-1$
+ public static String BROWSE;
public static String UNSET_REMOTE_SERVER_HOME;
public static String REMOTE_SERVER_CONFIG;
public static String TEST;
@@ -22,10 +23,15 @@
public static String CHANGE_HOSTNAME;
public static String CHANGE_REMOTE_SERVER_HOME;
public static String CHANGE_REMOTE_SERVER_CONFIG;
+ public static String CHANGE_REMOTE_CONFIG_FILE;
public static String RSE_REMOTE_LAUNCH;
public static String RSE_START_COMMAND;
public static String RSE_STOP_COMMAND;
public static String RSE_AUTOMATICALLY_CALCULATE;
+
+ public static String REMOTE_CONFIG_FILE_LABEL;
+ public static String REMOTE_SERVER_HOME_LABEL;
+
static {
NLS.initializeMessages(BUNDLE_NAME, RSEUIMessages.class);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties 2012-04-18 18:31:11 UTC (rev 40298)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIMessages.properties 2012-04-18 18:51:23 UTC (rev 40299)
@@ -1,3 +1,4 @@
+BROWSE=Browse...
UNSET_REMOTE_SERVER_HOME=REMOTE SERVER HOME
REMOTE_SERVER_CONFIG=Remote Server Configuration\:
TEST=Test...
@@ -15,8 +16,11 @@
CHANGE_RSE_HOST=Change RSE Host
CHANGE_HOSTNAME=Change Hostname
CHANGE_REMOTE_SERVER_HOME=Change RSE Server's Home Directory
-CHANGE_REMOTE_SERVER_CONFIG=Change RSE Server's Configuration
+CHANGE_REMOTE_SERVER_CONFIG=Change RSE Server's Configuration Folder
+CHANGE_REMOTE_CONFIG_FILE=Change RSE Server's Configuration File
RSE_REMOTE_LAUNCH=Remote Launch
RSE_START_COMMAND=Start Command
RSE_STOP_COMMAND=Stop Command
-RSE_AUTOMATICALLY_CALCULATE=Automatically Calculate
\ No newline at end of file
+RSE_AUTOMATICALLY_CALCULATE=Automatically Calculate
+REMOTE_CONFIG_FILE_LABEL=Remote Server Configuration File:
+REMOTE_SERVER_HOME_LABEL=Remote Server Home:
13 years, 11 months
JBoss Tools SVN: r40297 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin: android and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-04-18 13:00:38 -0400 (Wed, 18 Apr 2012)
New Revision: 40297
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java
Log:
https://issues.jboss.org/browse/JBIDE-11053 : skinned browsersim should provide a way to rotate phone "on" the skin
-code refactoring
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java 2012-04-18 14:58:10 UTC (rev 40296)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java 2012-04-18 17:00:38 UTC (rev 40297)
@@ -1,14 +1,21 @@
package org.jboss.tools.vpe.browsersim.ui.skin;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.ProgressBar;
import org.eclipse.swt.widgets.Text;
-public interface DeviceComposite {
+public abstract class DeviceComposite extends Composite {
+ protected Composite bodyComposite;
+ public DeviceComposite(Composite parent, int style) {
+ super(parent, style);
+ }
+
public abstract ImageButtonComposite getBackButtonComposite();
public abstract ImageButtonComposite getForwardButtonComposite();
@@ -29,16 +36,51 @@
public abstract StyledText getPageTitleStyledText();
- public abstract void addListener(int eventType, Listener listener);
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener)
+ */
+ @Override
+ public void addListener(int eventType, Listener listener) {
+ super.addListener(eventType, listener);
+ switch (eventType) {
+ case SWT.MouseDown:
+ case SWT.MouseUp:
+ case SWT.MouseMove:
+ bodyComposite.addListener(eventType, listener);
+ for (Control child : bodyComposite.getChildren()) {
+ child.addListener(eventType, listener);
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener)
+ */
+ @Override
+ public void removeListener(int eventType, Listener listener) {
+ super.removeListener(eventType, listener);
+ switch (eventType) {
+ case SWT.MouseDown:
+ case SWT.MouseUp:
+ case SWT.MouseMove:
+ bodyComposite.removeListener(eventType, listener);
+ for (Control child :bodyComposite.getChildren()) {
+ child.removeListener(eventType, listener);
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu)
+ */
+ @Override
+ public void setMenu(Menu menu) {
+ super.setMenu(menu);
+ bodyComposite.setMenu(menu);
+ for (Control child :bodyComposite.getChildren()) {
+ child.setMenu(menu);
+ }
+ }
- public abstract void removeListener(int eventType, Listener listener);
-
- public abstract void setMenu(Menu menu);
-
- ImageButtonComposite getHomeButtonComposite();
-
- public abstract Menu getMenu();
-
- public abstract void dispose();
-
+ public abstract ImageButtonComposite getHomeButtonComposite();
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java 2012-04-18 14:58:10 UTC (rev 40296)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java 2012-04-18 17:00:38 UTC (rev 40297)
@@ -10,17 +10,14 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.ProgressBar;
import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
-import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite;
-public class AndroidComposite extends Composite implements DeviceComposite {
+public class AndroidComposite extends DeviceComposite {
private ImageList imageList;
private Composite androidOsCompositeContainer;
@@ -40,8 +37,6 @@
private ImageButtonComposite homeButtonComposite;
private ImageButtonComposite refreshButtonComposite;
- private Composite bodyComposite;
-
/**
* Create the composite.
* @param parent
@@ -207,50 +202,4 @@
public StyledText getPageTitleStyledText() {
return null;
}
-
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener)
- */
- @Override
- public void addListener(int eventType, Listener listener) {
- super.addListener(eventType, listener);
- switch (eventType) {
- case SWT.MouseDown:
- case SWT.MouseUp:
- case SWT.MouseMove:
- bodyComposite.addListener(eventType, listener);
- for (Control child : bodyComposite.getChildren()) {
- child.addListener(eventType, listener);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener)
- */
- @Override
- public void removeListener(int eventType, Listener listener) {
- super.removeListener(eventType, listener);
- switch (eventType) {
- case SWT.MouseDown:
- case SWT.MouseUp:
- case SWT.MouseMove:
- bodyComposite.removeListener(eventType, listener);
- for (Control child :bodyComposite.getChildren()) {
- child.removeListener(eventType, listener);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu)
- */
- @Override
- public void setMenu(Menu menu) {
- super.setMenu(menu);
- bodyComposite.setMenu(menu);
- for (Control child :bodyComposite.getChildren()) {
- child.setMenu(menu);
- }
- }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-04-18 14:58:10 UTC (rev 40296)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-04-18 17:00:38 UTC (rev 40297)
@@ -9,18 +9,15 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.ProgressBar;
import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor;
import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
-import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite;
-public class AppleIPhoneComposite extends Composite implements DeviceComposite {
+public class AppleIPhoneComposite extends DeviceComposite {
private ImageList imageList;
private Composite iOsCompositeContainer;
@@ -38,8 +35,6 @@
private ImageButtonComposite forwardButtonComposite;
private ImageButtonComposite backButtonComposite;
- private Composite bodyComposite;
-
/**
* Create the composite.
* @param parent
@@ -196,53 +191,7 @@
return navBarComposite.getPageTitleStyledText();
}
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener)
- */
@Override
- public void addListener(int eventType, Listener listener) {
- super.addListener(eventType, listener);
- switch (eventType) {
- case SWT.MouseDown:
- case SWT.MouseUp:
- case SWT.MouseMove:
- bodyComposite.addListener(eventType, listener);
- for (Control child : bodyComposite.getChildren()) {
- child.addListener(eventType, listener);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener)
- */
- @Override
- public void removeListener(int eventType, Listener listener) {
- super.removeListener(eventType, listener);
- switch (eventType) {
- case SWT.MouseDown:
- case SWT.MouseUp:
- case SWT.MouseMove:
- bodyComposite.removeListener(eventType, listener);
- for (Control child :bodyComposite.getChildren()) {
- child.removeListener(eventType, listener);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu)
- */
- @Override
- public void setMenu(Menu menu) {
- super.setMenu(menu);
- bodyComposite.setMenu(menu);
- for (Control child :bodyComposite.getChildren()) {
- child.setMenu(menu);
- }
- }
-
- @Override
public ImageButtonComposite getHomeButtonComposite() {
return null;
}
13 years, 11 months
JBoss Tools SVN: r40296 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-04-18 10:58:10 -0400 (Wed, 18 Apr 2012)
New Revision: 40296
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical/08.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical/14.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical/23.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical/24.png
Log:
https://issues.jboss.org/browse/JBIDE-11320 : BrowserSim: layout of the iPhone 3 skin is broken on small screens
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical/08.png
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical/14.png
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical/23.png
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone3/vertical/24.png
===================================================================
(Binary files differ)
13 years, 11 months
JBoss Tools SVN: r40295 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: sample/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 10:53:46 -0400 (Wed, 18 Apr 2012)
New Revision: 40295
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java
Log:
modifying WSTestBase to use 7.1.1 AS as default + small fixing
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-18 14:52:50 UTC (rev 40294)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-18 14:53:46 UTC (rev 40295)
@@ -35,7 +35,9 @@
* @author jjankovi
*
*/
-@Require(server=(a)Server(type=ServerType.EAP), perspective="Java EE")
+@Require(perspective="Java EE",
+ server=(a)Server(type=ServerType.JbossAS,
+ version = "7.1", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ WSAllBotTests.class })
public class WSTestBase extends SWTTestExt {
@@ -63,10 +65,13 @@
public void setup() {
if (getEarProjectName() != null && !projectExists(getEarProjectName())) {
projectHelper.createEARProject(getEarProjectName());
+ if (!projectExists(getWsProjectName())) {
+ projectHelper.createProjectForEAR(getWsProjectName(),
+ getEarProjectName());
+ }
}
if (!projectExists(getWsProjectName())) {
- projectHelper.createProjectForEAR(getWsProjectName(),
- getEarProjectName());
+ projectHelper.createProject(getWsProjectName());
}
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2012-04-18 14:52:50 UTC (rev 40294)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2012-04-18 14:53:46 UTC (rev 40295)
@@ -25,7 +25,7 @@
protected String getWsProjectName() {
return "SampleSOAPWS";
}
-
+
@Test
public void testSampleSoapWS() {
IFile dd = getDD(getWsProjectName());
13 years, 11 months
JBoss Tools SVN: r40294 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 10:52:50 -0400 (Wed, 18 Apr 2012)
New Revision: 40294
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java
Log:
fixing for AS 7.1.1 hot deployment
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java 2012-04-18 14:51:43 UTC (rev 40293)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java 2012-04-18 14:52:50 UTC (rev 40294)
@@ -93,6 +93,7 @@
assertContains("<servlet-name>" + svcName + "</servlet-name>", dd);
break;
}
+ deploymentHelper.removeProjectFromServer(project);
deploymentHelper.runProject(project);
switch (type) {
case REST:
13 years, 11 months
JBoss Tools SVN: r40293 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 10:51:43 -0400 (Wed, 18 Apr 2012)
New Revision: 40293
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/DeploymentHelper.java
Log:
removing project from server method added
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/DeploymentHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/DeploymentHelper.java 2012-04-18 14:51:12 UTC (rev 40292)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/DeploymentHelper.java 2012-04-18 14:51:43 UTC (rev 40293)
@@ -11,9 +11,6 @@
package org.jboss.tools.ws.ui.bot.test.utils;
-import static org.eclipse.swtbot.swt.finder.SWTBotAssert.assertContains;
-import static org.junit.Assert.assertEquals;
-
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -21,22 +18,31 @@
import java.util.Scanner;
import java.util.logging.Logger;
-import org.jboss.tools.ui.bot.ext.SWTBotExt;
-import org.jboss.tools.ui.bot.ext.SWTOpenExt;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
-public class DeploymentHelper {
+public class DeploymentHelper extends SWTTestExt {
private final Logger LOGGER = Logger
.getLogger(DeploymentHelper.class.getName());
- private final SWTBotExt bot = new SWTBotExt();
- private final ProjectExplorer projectExplorer = new ProjectExplorer();
+ public void removeProjectFromServer(String project) {
+ SWTBotView serverView = open.viewOpen(
+ ActionItem.View.ServerServers.LABEL);
+ SWTBotTreeItem asNode = servers.findServerByName(serverView.bot().tree(),
+ configuredState.getServer().name);
+ asNode.expand();
+ for (int i = 0; i < asNode.getItems().length; i++) {
+ SWTBotTreeItem temp = asNode.getItems()[i];
+ if (temp.getText().contains(project)) {
+ servers.removeProjectFromServers(project);
+ }
+ }
+ }
- private final SWTOpenExt open = new SWTOpenExt(bot);
-
/**
* Method runs project on configured server
* @param project
13 years, 11 months
JBoss Tools SVN: r40292 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: properties and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 10:51:12 -0400 (Wed, 18 Apr 2012)
New Revision: 40292
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties
Log:
requirement set to AS 7.1.1 Final
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties 2012-04-18 14:44:48 UTC (rev 40291)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties 2012-04-18 14:51:12 UTC (rev 40292)
@@ -1,3 +1,5 @@
#SERVER=AS,6.0,default,../../../requirements/target/jboss-6.0.0.Final
-SERVER=AS,7.0,default,../../../requirements/target/jboss-as-web-7.0.2.Final
+#SERVER=AS,7.0,default,../../../requirements/target/jboss-as-web-7.0.2.Final
+SERVER=AS,7.0,default,../../../requirements/target/jboss-as-7.1.1.Final
+#SERVER=AS,7.1,default,/home/jjankovi/Dokumenty/Red_Hat_Stuff/Runtimes/jboss-as-7.1.1.Final
#SERVER=AS,6.0,default,/home/jjankovi/jboss-6.0.0.Final-WS
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties 2012-04-18 14:44:48 UTC (rev 40291)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties 2012-04-18 14:51:12 UTC (rev 40292)
@@ -1,2 +1,2 @@
-requirements=jbossas-7.0.2.Final
-#best runtime would AS 7 + WS / EAP 5.1 <=
+#requirements=jbossas-7.0.2.Final
+requirements=jbossas-7.1.1.Final
13 years, 11 months