November 2011 - jbosstools-commits

JBoss Tools SVN: r36440 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-11-18 10:25:09 -0500 (Fri, 18 Nov 2011) New Revision: 36440 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar Log: [JBIDE-9927] switched to latest client jar Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar =================================================================== (Binary files differ)

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36439 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-11-18 09:42:36 -0500 (Fri, 18 Nov 2011) New Revision: 36439 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java Log: JBIDE-10090 NPE in VPE NPE is fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2011-11-18 13:44:57 UTC (rev 36438) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2011-11-18 14:42:36 UTC (rev 36439) @@ -326,7 +326,7 @@ private ELContext createPageContext(IFile file, List<String> parents, String defaultContextType) { boolean isContextCachingAllowed = !EclipseUIUtil.isOpenInActiveEditor(file); ELContext context = isContextCachingAllowed ? getSavedContext(file) : null; - if (context == null) { + if (context == null && file != null) { IContentType type = IDE.getContentType(file); String typeId = (type == null ? null : type.getId());

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36438 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim: resources/config and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2011-11-18 08:44:57 -0500 (Fri, 18 Nov 2011) New Revision: 36438 Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/config/devices.cfg workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - adde support of default width\height Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java 2011-11-18 11:37:12 UTC (rev 36437) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java 2011-11-18 13:44:57 UTC (rev 36438) @@ -31,8 +31,8 @@ public class DevicesListStorage { private static final String DEFAULT_PREFERENCES_RESOURCE = "/org/jboss/tools/browsersim/resources/config/devices.cfg"; + private static final String USER_PREFERENCES_FOLDER = "org.jboss.tools.browsersim"; private static final String USER_PREFERENCES_FILE = "devices.cfg"; - private static final String USER_PREFERENCES_FOLDER = "org.jboss.tools.browsersim"; public static void saveUserDefinedDevicesList(DevicesList devicesList) { File configFolder = new File(USER_PREFERENCES_FOLDER); @@ -85,8 +85,10 @@ writer.write(encode( String.valueOf(device.getWidth()) )); writer.write('\t'); writer.write(encode( String.valueOf(device.getHeight()) )); - writer.write('\t'); - writer.write( encode(device.getUserAgent() )); + if (device.getUserAgent() != null) { + writer.write('\t'); + writer.write( encode(device.getUserAgent() )); + } writer.write('\n'); } @@ -106,7 +108,7 @@ if (nextLine != null) { selectedDeviceIndex = Integer.parseInt(nextLine); } - Pattern devicePattern = Pattern.compile("^(.*)\\t([0-9]*)\\t([0-9]*)\\t(.*)$"); + Pattern devicePattern = Pattern.compile("^(.*)\\t([0-9]*)\\t([0-9]*)(\\t(.*))?$"); List<Device> devices = new ArrayList<Device>(); while ((nextLine = reader.readLine()) != null) { @@ -116,7 +118,9 @@ decode(deviceMatcher.group(1)), Integer.parseInt(deviceMatcher.group(2)), Integer.parseInt(deviceMatcher.group(3)), - decode(deviceMatcher.group(4)) + deviceMatcher.group(5) != null + ? decode(deviceMatcher.group(5)) + : null )); } } Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/config/devices.cfg =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/config/devices.cfg 2011-11-18 11:37:12 UTC (rev 36437) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/resources/config/devices.cfg 2011-11-18 13:44:57 UTC (rev 36438) @@ -1,4 +1,6 @@ 0 +Default 0 0 +Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-18 11:37:12 UTC (rev 36437) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-18 13:44:57 UTC (rev 36438) @@ -293,7 +293,9 @@ DevicesListHolder devicesManager = (DevicesListHolder) o; DevicesList devicesList = devicesManager.getDevicesList(); setDevicesListForMenu(devicesList); - setDevice(devicesList.getDevices().get(devicesList.getSelectedDeviceIndex())); + if (devicesList.getSelectedDeviceIndex() < devicesList.getDevices().size()) { + setDevice(devicesList.getDevices().get(devicesList.getSelectedDeviceIndex())); + } devicesList.addObserver(new Observer() { public void update(Observable o, Object arg) { setDevice(((DevicesList)o).getDevices().get(((DevicesList)o).getSelectedDeviceIndex())); @@ -373,10 +375,21 @@ browser.setDefaultUserAgent(device.getUserAgent()); GridData data = (GridData) browser.getLayoutData(); - data.widthHint = device.getWidth(); - data.heightHint = device.getHeight(); - Point shellSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Rectangle clientArea = display.getClientArea(); + int shellWidthHint = SWT.DEFAULT; + if (device.getWidth() != 0) { + data.widthHint = device.getWidth(); + } else if (data.widthHint == SWT.DEFAULT) { + shellWidthHint = clientArea.width; + } + int shellHeightHint = SWT.DEFAULT; + if (device.getHeight() != 0) { + data.heightHint = device.getHeight(); + } else if (data.heightHint == SWT.DEFAULT) { + shellHeightHint = clientArea.height; + } + Point shellSize = shell.computeSize(shellWidthHint, shellHeightHint); shellSize.x = Math.min(shellSize.x, clientArea.width); shellSize.y = Math.min(shellSize.y, clientArea.height); shell.setSize(shellSize); Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java 2011-11-18 11:37:12 UTC (rev 36437) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/EditDeviceDialog.java 2011-11-18 13:44:57 UTC (rev 36438) @@ -107,7 +107,12 @@ textUserAgent = new Text(shell, SWT.BORDER); textUserAgent.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); textUserAgent.addFocusListener(new FocusGainedTextListener()); - textUserAgent.setText(initialDevice.getUserAgent()); + if (initialDevice.getUserAgent() != null) { + textUserAgent.setText(initialDevice.getUserAgent()); + } else { + textUserAgent.setText("Default User-Agent"); + textUserAgent.setEnabled(false); + } Composite composite = new Composite(shell, SWT.NONE); composite.setLayout(new FillLayout(SWT.HORIZONTAL)); @@ -118,7 +123,7 @@ buttonOk.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { resultDevice = new Device(textName.getText(), Integer.valueOf(textWidth.getText()), - Integer.valueOf(textHeight.getText()), textUserAgent.getText()); + Integer.valueOf(textHeight.getText()), textUserAgent.isEnabled() ? textUserAgent.getText() : null); shell.close(); } });

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36437 - in trunk/vpe/tests/org.jboss.tools.vpe.html.test: resources/htmlTest/WebContent/pages/jbide10178 and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2011-11-18 06:37:12 -0500 (Fri, 18 Nov 2011) New Revision: 36437 Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/cssInHtml.html trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/veryLongCssString.html trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/TestNPEinPreviewJbide10178.java Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllImportantTests.java Log: https://issues.jboss.org/browse/JBIDE-10178 - JUnit was added. Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/cssInHtml.html =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/cssInHtml.html (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/cssInHtml.html 2011-11-18 11:37:12 UTC (rev 36437) @@ -0,0 +1,220 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html dir="ltr"> +<head> +<meta http-equiv="Content-Style-Type" content="text/css"> + +<style type="text/css"> + +</style> +<script language="Javascript" type="text/javascript"> + +</script> +</head> +<body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#5493B4"> + +</body> +</html> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/veryLongCssString.html =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/veryLongCssString.html (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide10178/veryLongCssString.html 2011-11-18 11:37:12 UTC (rev 36437) @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html dir="ltr"> +<head> +<meta http-equiv="Content-Style-Type" content="text/css"> + +<style type="text/css"> + +</style> +</head> +<body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#5493B4"> + +</body> +</html> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllImportantTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllImportantTests.java 2011-11-18 11:35:42 UTC (rev 36436) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllImportantTests.java 2011-11-18 11:37:12 UTC (rev 36437) @@ -1,6 +1,7 @@ package org.jboss.tools.vpe.html.test; import org.jboss.tools.vpe.html.test.jbide.JBIDE3280Test; +import org.jboss.tools.vpe.html.test.jbide.TestNPEinPreviewJbide10178; import junit.framework.Test; import junit.framework.TestSuite; @@ -15,6 +16,7 @@ TestSuite suite = new TestSuite(HtmlAllImportantTests.class.getName()); //$JUnit-BEGIN$ suite.addTestSuite(JBIDE3280Test.class); + suite.addTestSuite(TestNPEinPreviewJbide10178.class); //$JUnit-END$ return suite; } Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/TestNPEinPreviewJbide10178.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/TestNPEinPreviewJbide10178.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/TestNPEinPreviewJbide10178.java 2011-11-18 11:37:12 UTC (rev 36437) @@ -0,0 +1,47 @@ +package org.jboss.tools.vpe.html.test.jbide; + +import org.eclipse.core.resources.IFile; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.base.test.TestUtil; +import org.jboss.tools.vpe.base.test.VpeTest; +import org.jboss.tools.vpe.html.test.HtmlAllTests; + +public class TestNPEinPreviewJbide10178 extends VpeTest { + + private static final String TEST_PAGE_NAME="jbide10178/cssInHtml.html"; //$NON-NLS-1$ + private static final String TEST_PAGE_NAME2="jbide10178/veryLongCssString.html"; //$NON-NLS-1$ + + public TestNPEinPreviewJbide10178(String name) { + super(name); + } + + public void testNPEinPreviewWhileDecodingUrl() throws Throwable { + setException(null); + IFile ifile = (IFile) TestUtil.getComponentPath( + TEST_PAGE_NAME, HtmlAllTests.IMPORT_PROJECT_NAME); + JSPMultiPageEditor jspMultiPageEditor = openEditor(ifile); + jspMultiPageEditor.pageChange(jspMultiPageEditor.getPreviewIndex()); + TestUtil.waitForJobs(); + /* + * Check error log for exception. + */ + if (getException() != null) { + throw getException(); + } + } + + public void testNPEinPreviewWhileDecodingUrlInLongCssString() throws Throwable { + setException(null); + IFile ifile = (IFile) TestUtil.getComponentPath( + TEST_PAGE_NAME2, HtmlAllTests.IMPORT_PROJECT_NAME); + JSPMultiPageEditor jspMultiPageEditor = openEditor(ifile); + jspMultiPageEditor.pageChange(jspMultiPageEditor.getPreviewIndex()); + TestUtil.waitForJobs(); + /* + * Check error log for exception. + */ + if (getException() != null) { + throw getException(); + } + } +}

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36436 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2011-11-18 06:35:42 -0500 (Fri, 18 Nov 2011) New Revision: 36436 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java Log: https://issues.jboss.org/browse/JBIDE-10178 - [^;] was returned to fix long css string. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-11-18 09:56:14 UTC (rev 36435) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-11-18 11:35:42 UTC (rev 36436) @@ -74,10 +74,13 @@ public static final String SINGLE_QUOTE_STRING = "\'"; //$NON-NLS-1$ public static final String QUOTE_STRING = "\""; //$NON-NLS-1$ /* + * https://issues.jboss.org/browse/JBIDE-10178 * Java regexp pattern to match css path from the url(..) construction. * It's implied that the css string has only one URL in it. + * For the long string regexp could be updated: + * (.*) should be replaced with ([^;]*) */ - public static final Pattern CSS_URL_PATTERN = Pattern.compile("(?<=\\burl\\b)(?:[\\p{Space}]*\$)[\\p{Space}]*(.*)[\\p{Space}]*(?:\$[\\p{Space}]*)(?=(?>[^\\)]*;|[^\\)]*))"); //$NON-NLS-1$ + public static final Pattern CSS_URL_PATTERN = Pattern.compile("(?<=\\burl\\b)(?:[\\p{Space}]*\$)[\\p{Space}]*([^;]*)[\\p{Space}]*(?:\$[\\p{Space}]*)(?=(?>[^\\)]*;|[^\\)]*))"); //$NON-NLS-1$ public static String ATTR_URL = "url"; //$NON-NLS-1$ public static String OPEN_BRACKET = "("; //$NON-NLS-1$

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36435 - 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: 2011-11-18 04:56:14 -0500 (Fri, 18 Nov 2011) New Revision: 36435 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java Log: [JBIDE-9927] added "check all" and "uncheck all" Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 09:00:21 UTC (rev 36434) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 09:56:14 UTC (rev 36435) @@ -32,14 +32,16 @@ import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.ICheckable; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.jface.wizard.IWizard; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Shell; @@ -66,22 +68,32 @@ @Override protected void doCreateControls(Composite parent, DataBindingContext dbc) { - GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).applyTo(parent); + GridLayoutFactory.fillDefaults().margins(10, 10).applyTo(parent); Group embedGroup = new Group(parent, SWT.NONE); embedGroup.setText("Embeddable Cartridges"); GridDataFactory.fillDefaults() - .hint(200, 150).align(SWT.FILL, SWT.FILL).span(2, 1).grab(true, true) - .applyTo(embedGroup); - FillLayout fillLayout = new FillLayout(); - fillLayout.marginHeight = 6; - fillLayout.marginWidth = 6; - embedGroup.setLayout(fillLayout); + .hint(200, 150).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(embedGroup); + GridLayoutFactory.fillDefaults() + .numColumns(3).margins(6, 6).applyTo(embedGroup); Composite tableContainer = new Composite(embedGroup, SWT.NONE); this.viewer = createTable(tableContainer); - viewer.addCheckStateListener(onEmbeddableCartridgeChecked()); + GridDataFactory.fillDefaults() + .span(3, 1).hint(200, 150).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(tableContainer); + viewer.addCheckStateListener(onCartridgeChecked()); + Button checkAllButton = new Button(embedGroup, SWT.PUSH); + checkAllButton.setText("Embed A&ll"); + GridDataFactory.fillDefaults() + .hint(110, SWT.DEFAULT).align(SWT.FILL, SWT.CENTER).applyTo(checkAllButton); + checkAllButton.addSelectionListener(onCheckAll()); + + Button uncheckAllButton = new Button(embedGroup, SWT.PUSH); + uncheckAllButton.setText("Embed N&one"); + GridDataFactory.fillDefaults() + .hint(110, SWT.DEFAULT).align(SWT.FILL, SWT.CENTER).applyTo(uncheckAllButton); + uncheckAllButton.addSelectionListener(onUncheckAll()); } protected CheckboxTableViewer createTable(Composite tableContainer) { @@ -113,7 +125,7 @@ layout.setColumnData(column.getColumn(), new ColumnWeightData(weight, true)); } - private ICheckStateListener onEmbeddableCartridgeChecked() { + private ICheckStateListener onCartridgeChecked() { return new ICheckStateListener() { @Override @@ -121,9 +133,9 @@ IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement(); if (event.getChecked()) { if (IEmbeddableCartridge.PHPMYADMIN_34.equals(cartridge)) { - addPhpMyACartridge(cartridge, event.getCheckable()); + addPhpMyACartridge(cartridge); } else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) { - addJenkinsCartridge(cartridge, event.getCheckable()); + addJenkinsCartridge(cartridge); } } else { model.getSelectedEmbeddableCartridges().remove(cartridge); @@ -132,7 +144,7 @@ }; } - private void addJenkinsCartridge(final IEmbeddableCartridge cartridge, final ICheckable checkable) { + private void addJenkinsCartridge(final IEmbeddableCartridge cartridge) { if (model.hasApplication(ICartridge.JENKINS_14)) { model.getSelectedEmbeddableCartridges().add(cartridge); } else { @@ -152,7 +164,7 @@ getShell().getDisplay().syncExec(new Runnable() { @Override public void run() { - checkable.setChecked(cartridge, false); + viewer.setChecked(cartridge, false); } }); return OpenShiftUIActivator @@ -165,11 +177,13 @@ } catch (Exception e) { // ignore } + } else { + viewer.setChecked(cartridge, false); } } } - private void addPhpMyACartridge(IEmbeddableCartridge cartridge, ICheckable checkable) { + private void addPhpMyACartridge(IEmbeddableCartridge cartridge) { if (MessageDialog.openQuestion(getShell(), "Enable MySQL cartridge", "To embed PhpMyAdmin, you'd also have to embed MySql. ")) { List<IEmbeddableCartridge> selectedCartriges = model.getSelectedEmbeddableCartridges(); @@ -177,11 +191,34 @@ selectedCartriges.add(IEmbeddableCartridge.MYSQL_51); selectedCartriges.add(cartridge); } else { - checkable.setChecked(cartridge, false); + viewer.setChecked(cartridge, false); } refreshViewer(); } + private SelectionListener onCheckAll() { + return new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + viewer.setAllChecked(true); + addJenkinsCartridge(IEmbeddableCartridge.JENKINS_14); + } + + }; + } + + private SelectionListener onUncheckAll() { + return new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + viewer.setAllChecked(false); + } + + }; + } + @Override protected void onPageActivated(DataBindingContext dbc) { try {

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36434 - 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: 2011-11-18 04:00:21 -0500 (Fri, 18 Nov 2011) New Revision: 36434 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java Log: [JBIDE-9927] checking/unchecking mysql if you check phpmyadmin and answer with "yes" Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 08:59:42 UTC (rev 36433) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 09:00:21 UTC (rev 36434) @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.runtime.IProgressMonitor; @@ -31,10 +32,12 @@ import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ICheckStateListener; +import org.eclipse.jface.viewers.ICheckable; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; @@ -68,7 +71,7 @@ Group embedGroup = new Group(parent, SWT.NONE); embedGroup.setText("Embeddable Cartridges"); GridDataFactory.fillDefaults() - .hint(300, 150).align(SWT.FILL, SWT.FILL).span(2, 1).grab(true, true) + .hint(200, 150).align(SWT.FILL, SWT.FILL).span(2, 1).grab(true, true) .applyTo(embedGroup); FillLayout fillLayout = new FillLayout(); fillLayout.marginHeight = 6; @@ -118,11 +121,10 @@ IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement(); if (event.getChecked()) { if (IEmbeddableCartridge.PHPMYADMIN_34.equals(cartridge)) { - addPhpMyACartridge(cartridge); + addPhpMyACartridge(cartridge, event.getCheckable()); + } else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) { + addJenkinsCartridge(cartridge, event.getCheckable()); } - else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) { - addJenkinsCartridge(cartridge); - } } else { model.getSelectedEmbeddableCartridges().remove(cartridge); } @@ -130,29 +132,36 @@ }; } - private void addJenkinsCartridge(IEmbeddableCartridge cartridge) { + private void addJenkinsCartridge(final IEmbeddableCartridge cartridge, final ICheckable checkable) { if (model.hasApplication(ICartridge.JENKINS_14)) { - model.getSelectedEmbeddableCartridges().add(cartridge); + model.getSelectedEmbeddableCartridges().add(cartridge); } else { final JenkinsApplicationDialog dialog = new JenkinsApplicationDialog(getShell()); if (dialog.open() == Dialog.OK) { try { - WizardUtils.runInWizard(new Job("Loading embeddable cartridges...") { + final String name = dialog.getValue(); + WizardUtils.runInWizard(new Job( + NLS.bind("Creating jenkins application \"{0}\"...", name)) { @Override protected IStatus run(IProgressMonitor monitor) { try { - model.createJenkinsApplication(dialog.getValue()); + model.createJenkinsApplication(name); return Status.OK_STATUS; } catch (Exception e) { - clearCartridgesViewer(); - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "Could not load embeddable cartridges", e); + getShell().getDisplay().syncExec(new Runnable() { + @Override + public void run() { + checkable.setChecked(cartridge, false); + } + }); + return OpenShiftUIActivator + .createErrorStatus("Could not load embeddable cartridges", e); } } }, getContainer(), getDataBindingContext()); - model.getSelectedEmbeddableCartridges().add(cartridge); + model.getSelectedEmbeddableCartridges().add(cartridge); } catch (Exception e) { // ignore } @@ -160,10 +169,17 @@ } } - private void addPhpMyACartridge(IEmbeddableCartridge cartridge) { - MessageDialog.openQuestion(getShell(), "Enable MySQL cartridge", - "To embed PhpMyAdmin, you'd also have to embed MySql. "); - model.getSelectedEmbeddableCartridges().add(cartridge); + private void addPhpMyACartridge(IEmbeddableCartridge cartridge, ICheckable checkable) { + if (MessageDialog.openQuestion(getShell(), "Enable MySQL cartridge", + "To embed PhpMyAdmin, you'd also have to embed MySql. ")) { + List<IEmbeddableCartridge> selectedCartriges = model.getSelectedEmbeddableCartridges(); + viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true); + selectedCartriges.add(IEmbeddableCartridge.MYSQL_51); + selectedCartriges.add(cartridge); + } else { + checkable.setChecked(cartridge, false); + } + refreshViewer(); } @Override @@ -174,12 +190,11 @@ @Override protected IStatus run(IProgressMonitor monitor) { try { - setCartridgesViewerInput(model.loadEmbeddableCartridges()); + setViewerInput(model.loadEmbeddableCartridges()); return Status.OK_STATUS; } catch (Exception e) { - clearCartridgesViewer(); - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "Could not load embeddable cartridges", e); + clearViewer(); + return OpenShiftUIActivator.createErrorStatus("Could not load embeddable cartridges", e); } } @@ -189,11 +204,11 @@ } } - private void clearCartridgesViewer() { - setCartridgesViewerInput(new ArrayList<IEmbeddableCartridge>()); + private void clearViewer() { + setViewerInput(new ArrayList<IEmbeddableCartridge>()); } - private void setCartridgesViewerInput(final Collection<IEmbeddableCartridge> cartridges) { + private void setViewerInput(final Collection<IEmbeddableCartridge> cartridges) { getShell().getDisplay().syncExec(new Runnable() { @Override @@ -203,21 +218,26 @@ }); } + private void refreshViewer() { + getShell().getDisplay().syncExec(new Runnable() { + + @Override + public void run() { + viewer.refresh(true, true); + } + }); + } + private static class JenkinsApplicationDialog extends InputDialog { public JenkinsApplicationDialog(Shell shell) { super(shell , "New Jenkins application" - , "To embed jenkins into your application you'd first have to create a jenkins application. " - + "Please provide it's name" + , "To embed jenkins into your application, you'd first have to create a jenkins application." , null , new JenkinsNameValidator()); } - protected int getInputTextStyle() { - return SWT.SINGLE | SWT.BORDER | SWT.PASSWORD; - } - private static class JenkinsNameValidator implements IInputValidator { @Override @@ -230,5 +250,4 @@ } } - } \ No newline at end of file

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36433 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-11-18 03:59:42 -0500 (Fri, 18 Nov 2011) New Revision: 36433 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar Log: [JBIDE-9927] switched to latest client jar Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar =================================================================== (Binary files differ)

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36432 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-11-18 02:06:53 -0500 (Fri, 18 Nov 2011) New Revision: 36432 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DeployableLaunchConfiguration.java Log: class not deprecated, changed javadoc Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DeployableLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DeployableLaunchConfiguration.java 2011-11-18 05:10:12 UTC (rev 36431) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DeployableLaunchConfiguration.java 2011-11-18 07:06:53 UTC (rev 36432) @@ -20,7 +20,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; /** - * @deprecated + * Not deprecated, still in use by the deploy-only server */ public class DeployableLaunchConfiguration implements ILaunchConfigurationDelegate {

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r36431 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: META-INF and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-11-18 00:10:12 -0500 (Fri, 18 Nov 2011) New Revision: 36431 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/EarArtifactAdapter.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: JBIDE-9893 - browser open for ear project Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2011-11-18 04:21:00 UTC (rev 36430) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2011-11-18 05:10:12 UTC (rev 36431) @@ -22,7 +22,8 @@ org.eclipse.wst.common.frameworks;bundle-version="1.2.0", org.eclipse.jst.jee;bundle-version="1.0.401", org.eclipse.core.commands;bundle-version="3.6.0", - org.eclipse.pde.core;bundle-version="3.7.0" + org.eclipse.pde.core;bundle-version="3.7.0", + org.eclipse.jst.j2ee.web;bundle-version="1.1.500" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.as.core.extensions.descriptors, Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/EarArtifactAdapter.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/EarArtifactAdapter.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/EarArtifactAdapter.java 2011-11-18 05:10:12 UTC (rev 36431) @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2011 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.core.modules; + +import org.eclipse.core.resources.IProject; +import org.eclipse.jst.j2ee.internal.web.deployables.WebDeployableArtifactUtil; +import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IModuleArtifact; +import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate; +import org.eclipse.wst.server.core.model.ModuleDelegate; + +public class EarArtifactAdapter extends ModuleArtifactAdapterDelegate { + + public EarArtifactAdapter() { + } + + @Override + public IModuleArtifact getModuleArtifact(Object obj) { + if( obj instanceof IProject) { + IProject p = (IProject)obj; + IModule[] mods = ServerUtil.getModules(p); + for( int i = 0; i < mods.length; i++ ) { + if( mods[i].getModuleType().getId().equals(IModuleConstants.JST_EAR_MODULE)) { + return getArtifactFor(mods[i]); + } + } + } + return null; + } + + protected IModuleArtifact getArtifactFor(IModule ear) { + ModuleDelegate del = (ModuleDelegate)ear.loadAdapter(ModuleDelegate.class, null); + IModule[] children = del.getChildModules(); + IModuleArtifact tmp = null; + for( int i = 0; i < children.length; i++ ) { + String typeId = children[i].getModuleType().getId(); + if( typeId.equals(IModuleConstants.JST_WEB_MODULE) || typeId.equals(IModuleConstants.WST_WEB_MODULE)) + tmp = WebDeployableArtifactUtil.getModuleObject(children[i].getProject()); + if( tmp != null ) + return tmp; + } + return null; + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-11-18 04:21:00 UTC (rev 36430) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-11-18 05:10:12 UTC (rev 36431) @@ -1091,4 +1091,24 @@ </publisher> </extension> + + <extension + point="org.eclipse.wst.server.core.moduleArtifactAdapters"> + <moduleArtifactAdapter + class="org.jboss.ide.eclipse.as.core.modules.EarArtifactAdapter" + id="org.jboss.ide.eclipse.as.core.modules.EarArtifactAdapter" + priority="20"> + <enablement> + <with variable="selection"> + <adapt type="org.eclipse.core.resources.IProject"> + <test + forcePluginActivation="true" + property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="jst.ear"> + </test> + </adapt> + </with></enablement> + </moduleArtifactAdapter> + </extension> + </plugin>

14 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2011