JBoss Tools SVN: r39539 - branches/jbosstools-3.3.0.Beta1/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-03-15 11:35:44 -0400 (Thu, 15 Mar 2012)
New Revision: 39539
Modified:
branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml
Log:
bump stable_branch from Beta1 to Beta2 to allow quick respin
Modified: branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml 2012-03-15 15:34:10 UTC (rev 39538)
+++ branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml 2012-03-15 15:35:44 UTC (rev 39539)
@@ -18,7 +18,7 @@
<scmBranch>trunk</scmBranch>
<JBT_VERSION>3.3.0</JBT_VERSION>
<JBDS_VERSION>5.0.0</JBDS_VERSION>
- <BUILD_ALIAS>Beta1</BUILD_ALIAS>
+ <BUILD_ALIAS>Beta2</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
12 years, 6 months
JBoss Tools SVN: r39538 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-03-15 11:34:10 -0400 (Thu, 15 Mar 2012)
New Revision: 39538
Modified:
trunk/build/parent/pom.xml
Log:
bump trunk to Beta3 to allow quick Beta2 release from stable_branch
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-03-15 15:11:46 UTC (rev 39537)
+++ trunk/build/parent/pom.xml 2012-03-15 15:34:10 UTC (rev 39538)
@@ -18,7 +18,7 @@
<scmBranch>trunk</scmBranch>
<JBT_VERSION>3.3.0</JBT_VERSION>
<JBDS_VERSION>5.0.0</JBDS_VERSION>
- <BUILD_ALIAS>Beta2</BUILD_ALIAS>
+ <BUILD_ALIAS>Beta3</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
12 years, 6 months
JBoss Tools SVN: r39537 - trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: jgargula
Date: 2012-03-15 11:11:46 -0400 (Thu, 15 Mar 2012)
New Revision: 39537
Modified:
trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
Log:
Reverted buggy code
Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2012-03-15 14:41:01 UTC (rev 39536)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2012-03-15 15:11:46 UTC (rev 39537)
@@ -154,12 +154,7 @@
bot.sleep(Timing.time1S());
KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER);
KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER);
- for (int i = 0; i < 60; i++) {
- bot.sleep(Timing.time2S());
- if (console.getConsoleText(1000L,1000L,true).trim().endsWith("Session closed")) {
- break;
- }
- }
+ bot.sleep(Timing.time30S()); // so long because of NFS filesystem on remote machines
KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER);
KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER);
}
12 years, 6 months
JBoss Tools SVN: r39536 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-15 10:41:01 -0400 (Thu, 15 Mar 2012)
New Revision: 39536
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
JBIDE-11330 - as7.1 needs higher exec environment (missed commit) and JBIDE-11331 - storing as7 last-used runtime location
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2012-03-15 14:24:59 UTC (rev 39535)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2012-03-15 14:41:01 UTC (rev 39536)
@@ -18,6 +18,7 @@
import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.model.RuntimeDelegate;
import org.jboss.ide.eclipse.as.core.Messages;
@@ -112,7 +113,7 @@
return getExecutionEnvironment().getDefaultVM();
}
- public static IVMInstall[] getValidJREs(IRuntimeType type) {
+ public IVMInstall[] getValidJREs(IRuntimeType type) {
return getDefaultExecutionEnvironment(type) == null ? new IVMInstall[0]
: getDefaultExecutionEnvironment(type).getCompatibleVMs();
}
@@ -123,7 +124,7 @@
EnvironmentsManager.getDefault().getEnvironment(id);
}
- public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) {
+ public IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) {
// NEW_SERVER_ADAPTER Subclasses override this
String typeId = rtType.getId();
if( typeId.equals(IConstants.EAP_50)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-03-15 14:24:59 UTC (rev 39535)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-03-15 14:41:01 UTC (rev 39536)
@@ -93,7 +93,7 @@
return ""; //$NON-NLS-1$
}
- public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) {
+ public IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) {
return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6"); //$NON-NLS-1$
- }
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2012-03-15 14:24:59 UTC (rev 39535)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2012-03-15 14:41:01 UTC (rev 39536)
@@ -254,6 +254,7 @@
exit();
IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
((IRuntimeWorkingCopy) rt).setLocation(new Path(homeDir));
+ saveRuntimeLocationInPreferences(rt);
}
@Override
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-03-15 14:24:59 UTC (rev 39535)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-03-15 14:41:01 UTC (rev 39536)
@@ -20,7 +20,8 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -70,6 +71,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
+import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
@@ -80,6 +82,7 @@
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.UIUtil;
+import org.osgi.service.prefs.BackingStoreException;
/**
* @author Stryker
@@ -179,9 +182,9 @@
protected void fillHomeDir(IRuntime rt) {
if( rt.getLocation() == null ) {
// new runtime creation
- Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
- String value = prefs.getString(IPreferenceKeys.RUNTIME_HOME_PREF_KEY_PREFIX + rt.getRuntimeType().getId());
-
+ IEclipsePreferences prefs2 = InstanceScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
+ String value = prefs2.get(IPreferenceKeys.RUNTIME_HOME_PREF_KEY_PREFIX + rt.getRuntimeType().getId(), null);
+
String locationDefault = Platform.getOS().equals(Platform.WS_WIN32)
? "c:/program files/jboss-" : "/usr/bin/jboss-"; //$NON-NLS-1$ //$NON-NLS-2$
if( isEAP() )
@@ -762,7 +765,9 @@
protected List<IVMInstall> getValidJREs() {
- return Arrays.asList(LocalJBossServerRuntime.getValidJREs(getRuntimeType()));
+ IRuntime r = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+ AbstractLocalJBossServerRuntime jbsrt = (AbstractLocalJBossServerRuntime)r.loadAdapter(AbstractLocalJBossServerRuntime.class, null);
+ return Arrays.asList(jbsrt.getValidJREs(getRuntimeType()));
}
// WST API methods
@@ -792,11 +797,20 @@
if( rt instanceof IRuntimeWorkingCopy ) {
IRuntimeWorkingCopy r = (IRuntimeWorkingCopy) rt;
IRuntime saved = r.save(false, new NullProgressMonitor());
- Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
- prefs.setValue(IPreferenceKeys.RUNTIME_HOME_PREF_KEY_PREFIX + saved.getRuntimeType().getId(), homeDir);
getTaskModel().putObject(TaskModel.TASK_RUNTIME, saved);
+ saveRuntimeLocationInPreferences(saved);
}
}
+
+ protected void saveRuntimeLocationInPreferences(IRuntime runtime) {
+ IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
+ prefs.put(IPreferenceKeys.RUNTIME_HOME_PREF_KEY_PREFIX + runtime.getRuntimeType().getId(), homeDir);
+ try {
+ prefs.flush();
+ } catch(BackingStoreException e) {
+ // TODO when adding tracing. This is not important enough for an error log entry
+ }
+ }
public boolean isComplete() {
return beenEntered && (getErrorString() == null ? true : false);
12 years, 6 months
JBoss Tools SVN: r39535 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim: ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-03-15 10:24:59 -0400 (Thu, 15 Mar 2012)
New Revision: 39535
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/page-title-background.png
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSPageTitleStyledText.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AppleIPhone3Skin.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/BrowserSimSkin.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/NativeSkin.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java
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/IOSNavBarComposite.java
Log:
https://issues.jboss.org/browse/JBIDE-11191 : BrowserSim Web Page Title - should change to the <title></title>
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/page-title-background.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/page-title-background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-03-15 14:22:02 UTC (rev 39534)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-03-15 14:24:59 UTC (rev 39535)
@@ -28,6 +28,8 @@
import org.eclipse.swt.browser.ProgressListener;
import org.eclipse.swt.browser.StatusTextEvent;
import org.eclipse.swt.browser.StatusTextListener;
+import org.eclipse.swt.browser.TitleEvent;
+import org.eclipse.swt.browser.TitleListener;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.MenuAdapter;
@@ -247,6 +249,13 @@
skin.setAddressBarVisible(true);
}
});
+
+ browser.addTitleListener(new TitleListener() {
+ @Override
+ public void changed(TitleEvent event) {
+ skin.pageTitleChanged(event.title);
+ }
+ });
}
private void setShellAttibutes() {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AppleIPhone3Skin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AppleIPhone3Skin.java 2012-03-15 14:22:02 UTC (rev 39534)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AppleIPhone3Skin.java 2012-03-15 14:24:59 UTC (rev 39535)
@@ -366,5 +366,10 @@
public void setContextMenu(Menu contextMenu) {
shell.setMenu(contextMenu);
}
+
+ @Override
+ public void pageTitleChanged(String newTitle) {
+ // not supported
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/BrowserSimSkin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/BrowserSimSkin.java 2012-03-15 14:22:02 UTC (rev 39534)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/BrowserSimSkin.java 2012-03-15 14:24:59 UTC (rev 39535)
@@ -30,6 +30,7 @@
void setControlHandler(ControlHandler controlHandler);
void locationChanged(String newLocation, boolean backEnabled, boolean forwardEnabled);
+ void pageTitleChanged(String newTitle);
void progressChanged(int percents); // -1 for completed
void statusTextChanged(String newStatusText);
void setOrientationAndSize(Point maximumShellSize, int orientation, Point browserSize);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/NativeSkin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/NativeSkin.java 2012-03-15 14:22:02 UTC (rev 39534)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/NativeSkin.java 2012-03-15 14:24:59 UTC (rev 39535)
@@ -284,6 +284,11 @@
}
@Override
+ public void pageTitleChanged(String newTitle) {
+ // not supported
+ }
+
+ @Override
public void statusTextChanged(String statusText) {
statusLabel.setText(statusText);
}
@@ -297,4 +302,5 @@
public void setContextMenu(Menu contextMenu) {
// not supported
}
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java 2012-03-15 14:22:02 UTC (rev 39534)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java 2012-03-15 14:24:59 UTC (rev 39535)
@@ -5,9 +5,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Region;
import org.eclipse.swt.layout.FillLayout;
@@ -284,8 +281,14 @@
iPhoneComposite.getBackButtonComposite().setEnabled(backEnabled);
iPhoneComposite.getForwardButtonComposite().setEnabled(forwardEnabled);
}
+
@Override
+ public void pageTitleChanged(String newTitle) {
+ iPhoneComposite.getPageTitleStyledText().setText(newTitle);
+ }
+
+ @Override
public void progressChanged(int percents) {
ProgressBar progressBar = iPhoneComposite.getProgressBar();
if (percents > 0) {
@@ -306,6 +309,7 @@
public void setOrientationAndSize(Point maximumShellSize, int orientation, Point browserSize) {
vertical = (orientation == DeviceOrientation.PORTRAIT || orientation == DeviceOrientation.PORTRAIT_INVERTED);
String urlTextText = iPhoneComposite.getUrlText().getText();
+ String pageTitle = iPhoneComposite.getPageTitleStyledText().getText();
boolean backEnabled = iPhoneComposite.getBackButtonComposite().getEnabled();
boolean forwardEnabled = iPhoneComposite.getForwardButtonComposite().getEnabled();
boolean navBarVisible = iPhoneComposite.isNavBarCompositeVisible();
@@ -344,6 +348,7 @@
setShellRegion();
iPhoneComposite.getUrlText().setText(urlTextText);
+ iPhoneComposite.getPageTitleStyledText().setText(pageTitle);
iPhoneComposite.getBackButtonComposite().setEnabled(backEnabled);
iPhoneComposite.getForwardButtonComposite().setEnabled(forwardEnabled);
iPhoneComposite.setNavBarCompositeVisible(navBarVisible);
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-03-15 14:22:02 UTC (rev 39534)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-03-15 14:24:59 UTC (rev 39535)
@@ -1,5 +1,6 @@
package org.jboss.tools.vpe.browsersim.ui.skin.ios;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.layout.FormAttachment;
@@ -148,6 +149,10 @@
return navBarComposite.getProgressBar();
}
+ public StyledText getPageTitleStyledText() {
+ return navBarComposite.getPageTitleStyledText();
+ }
+
@Override
public void addListener(int eventType, Listener listener) {
super.addListener(eventType, listener);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java 2012-03-15 14:22:02 UTC (rev 39534)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java 2012-03-15 14:24:59 UTC (rev 39535)
@@ -1,5 +1,6 @@
package org.jboss.tools.vpe.browsersim.ui.skin.ios;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
@@ -20,6 +21,7 @@
private ImageButtonComposite refreshButtonComposite;
private Text urlText;
private ProgressBar progressBar;
+ private StyledText pageTitleStyledText;
/**
* Create the composite.
@@ -31,8 +33,17 @@
this.setLayout(new FormLayout());
+ pageTitleStyledText = new IOSPageTitleStyledText(this, imageList);
+ FormData formData = new FormData();
+ formData.left = new FormAttachment(0, 0);
+ formData.right = new FormAttachment(100, 0);
+ formData.top = new FormAttachment(0, 0);
+ formData.bottom = new FormAttachment(0, 26);
+ formData.height = 27;
+ pageTitleStyledText.setLayoutData(formData);
urlText = new Text(this, SWT.SINGLE);
- FormData formData = new FormData();
+
+ formData = new FormData();
formData.left = new FormAttachment(0, 12);
formData.right = new FormAttachment(100, -62);
formData.top = new FormAttachment(0, 33);
@@ -107,4 +118,8 @@
public ProgressBar getProgressBar() {
return progressBar;
}
+
+ public StyledText getPageTitleStyledText() {
+ return pageTitleStyledText;
+ }
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSPageTitleStyledText.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSPageTitleStyledText.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSPageTitleStyledText.java 2012-03-15 14:24:59 UTC (rev 39535)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.browsersim.ui.skin.ios;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Device;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.vpe.browsersim.ui.skin.ImageList;
+
+public class IOSPageTitleStyledText extends StyledText {
+ private final String BD = "ios/";
+ private Font font;
+ private Color foregroundColor;
+
+ public IOSPageTitleStyledText(Composite parent, ImageList imageList) {
+ super(parent, SWT.SINGLE | SWT.WRAP);
+ setBackgroundImage(imageList.getImage(BD + "page-title-background.png"));
+ setEditable(false);
+ setEnabled(false);
+ setMargins(16, 6, 16, 0);
+ setAlignment(SWT.CENTER);
+ font = createFont(this.getDisplay(), 9, SWT.BOLD);
+ setFont(font);
+ foregroundColor = new Color(this.getDisplay(), 64, 64, 64);
+ setForeground(foregroundColor);
+ }
+
+ static Font createFont(Device device, int FONT_SIZE, int style) {
+ Font font;
+ if(SWT.getPlatform() == "win32") {
+ font = new Font(device, "Arial", FONT_SIZE, style);
+ } else if (SWT.getPlatform() == "motif") {
+ font = new Font(device, "Times", FONT_SIZE, style);
+ } else if (SWT.getPlatform() == "gtk") {
+ font = new Font(device, "Baekmuk Batang", FONT_SIZE, style);
+ } else if (SWT.getPlatform() == "cocoa") {
+ font = new Font(device, "Helvetica", FONT_SIZE, style);
+ } else { // photon
+ font = new Font(device, "Verdana", FONT_SIZE, style);
+ }
+
+ return font;
+ }
+
+ @Override
+ public void dispose() {
+ super.dispose();
+ font.dispose();
+ foregroundColor.dispose();
+ }
+}
12 years, 6 months
JBoss Tools SVN: r39534 - trunk/central/features/org.jboss.tools.central.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-03-15 10:22:02 -0400 (Thu, 15 Mar 2012)
New Revision: 39534
Modified:
trunk/central/features/org.jboss.tools.central.feature/feature.xml
Log:
JBIDE-11299 - include Examples features when installing Central
Modified: trunk/central/features/org.jboss.tools.central.feature/feature.xml
===================================================================
--- trunk/central/features/org.jboss.tools.central.feature/feature.xml 2012-03-15 14:10:18 UTC (rev 39533)
+++ trunk/central/features/org.jboss.tools.central.feature/feature.xml 2012-03-15 14:22:02 UTC (rev 39534)
@@ -13,4 +13,10 @@
</license>
<plugin id="org.jboss.tools.central" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+ <!-- JBIDE-11299 - include Examples features when installing Central -->
+ <includes id="org.jboss.tools.project.examples.feature" version="0.0.0" />
+ <includes id="org.jboss.tools.community.project.examples.feature" version="0.0.0" />
+ <includes id="org.jboss.tools.maven.project.examples.feature" version="0.0.0" />
+
</feature>
12 years, 6 months
JBoss Tools SVN: r39533 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: v7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-15 10:10:18 -0400 (Thu, 15 Mar 2012)
New Revision: 39533
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
Log:
JBIDE-11330 - as7.1 needs higher exec environment
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2012-03-15 13:37:20 UTC (rev 39532)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2012-03-15 14:10:18 UTC (rev 39533)
@@ -124,11 +124,10 @@
}
public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) {
+ // NEW_SERVER_ADAPTER Subclasses override this
String typeId = rtType.getId();
if( typeId.equals(IConstants.EAP_50)
- || typeId.equals(IConstants.AS_60)
- || typeId.equals(IConstants.EAP_60)
- || typeId.equals(IConstants.AS_70)) {
+ || typeId.equals(IConstants.AS_60)) {
return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6"); //$NON-NLS-1$
}
return EnvironmentsManager.getDefault().getEnvironment("J2SE-1.4"); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-03-15 13:37:20 UTC (rev 39532)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-03-15 14:10:18 UTC (rev 39533)
@@ -14,6 +14,9 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.internal.launching.environments.EnvironmentsManager;
+import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
+import org.eclipse.wst.server.core.IRuntimeType;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -89,6 +92,8 @@
public String getJBossConfiguration() {
return ""; //$NON-NLS-1$
}
-
+ public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) {
+ return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6"); //$NON-NLS-1$
+ }
}
12 years, 6 months
JBoss Tools SVN: r39532 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-15 09:37:20 -0400 (Thu, 15 Mar 2012)
New Revision: 39532
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java
Log:
Addition of LocalBehaviorUI caused a white block to appear in the new server wizard. Fixed. And never set it was complete initially. Fixed.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java 2012-03-15 13:29:18 UTC (rev 39531)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java 2012-03-15 13:37:20 UTC (rev 39532)
@@ -29,6 +29,7 @@
public void fillComposite(Composite parent, final IServerModeUICallback callback) {
//Do Nothing, just verify
this.callback = callback;
+ callback.setErrorMessage(null);
if( callback.getCallbackType() == callback.EDITOR)
verify();
callback.getServer().addPropertyChangeListener(new PropertyChangeListener(){
@@ -38,7 +39,6 @@
}});
parent.setLayout(new FillLayout());
Composite child = new Composite(parent, SWT.None);
-
}
private void verify() {
12 years, 6 months
JBoss Tools SVN: r39531 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-15 09:29:18 -0400 (Thu, 15 Mar 2012)
New Revision: 39531
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java
Log:
Addition of LocalBehaviorUI caused a white block to appear in the new server wizard. Fixed.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java 2012-03-15 13:28:37 UTC (rev 39530)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java 2012-03-15 13:29:18 UTC (rev 39531)
@@ -99,6 +99,9 @@
public Object getAttribute(String key) {
return tm.getObject(key);
}
+ public int getCallbackType() {
+ return WIZARD;
+ }
}
@@ -141,6 +144,10 @@
public Object getAttribute(String key) {
return null;
}
+ public int getCallbackType() {
+ return EDITOR;
+ }
}
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java 2012-03-15 13:28:37 UTC (rev 39530)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java 2012-03-15 13:29:18 UTC (rev 39531)
@@ -21,12 +21,15 @@
public interface IDeploymentTypeUI {
public interface IServerModeUICallback {
+ public static final int WIZARD = 1;
+ public static final int EDITOR = 2;
public IServerWorkingCopy getServer();
public IRuntime getRuntime();
public void execute(IUndoableOperation operation);
public void executeLongRunning(Job j);
public void setErrorMessage(String msg);
public Object getAttribute(String key);
+ public int getCallbackType();
}
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java 2012-03-15 13:28:37 UTC (rev 39530)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java 2012-03-15 13:29:18 UTC (rev 39531)
@@ -16,6 +16,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.internal.ExtendedServerPropertiesAdapterFactory;
@@ -24,14 +26,19 @@
public class LocalBehaviorUI implements IDeploymentTypeUI {
private IServerModeUICallback callback;
- public void fillComposite(Composite parent, IServerModeUICallback callback) {
+ public void fillComposite(Composite parent, final IServerModeUICallback callback) {
//Do Nothing, just verify
this.callback = callback;
- verify();
+ if( callback.getCallbackType() == callback.EDITOR)
+ verify();
callback.getServer().addPropertyChangeListener(new PropertyChangeListener(){
public void propertyChange(PropertyChangeEvent evt) {
- verify();
+ if( callback.getCallbackType() == callback.EDITOR)
+ verify();
}});
+ parent.setLayout(new FillLayout());
+ Composite child = new Composite(parent, SWT.None);
+
}
private void verify() {
12 years, 6 months