September 2009 - jbosstools-commits

JBoss Tools SVN: r17726 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: mozilla and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-09-25 07:34:43 -0400 (Fri, 25 Sep 2009) New Revision: 17726 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java Log: https://jira.jboss.org/jira/browse/JBIDE-4935, editors flipping was fixed. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-09-25 08:17:28 UTC (rev 17725) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-09-25 11:34:43 UTC (rev 17726) @@ -546,13 +546,15 @@ * Editors orientation is based on preference's settings. */ container = new CustomSashForm(cmpEd, CustomSashForm - .getSplittingFromPreferences()); + .getSplittingDirection(JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING))); if (editorSettings != null) { editorSettings.addSetting(new SashSetting(container)); } container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING))) { sourceContent = new Composite(container, SWT.NONE); visualContent = new Composite(container, SWT.NONE); } else { @@ -687,7 +689,7 @@ listener = new XModelTreeListener() { public void nodeChanged(XModelTreeEvent event) { - fillContainer(); + fillContainer(false, null); selectionBar.setVisible(selectionBar.getAlwaysVisibleOption()); } @@ -762,7 +764,16 @@ }; } - public void fillContainer() { + /** + * Re-fills the VPE container according to new settings. + * + * @param useCurrentEditorSettings + * if <code>true</code> VPE will hold its current state + * otherwise values from preference page will be used, + * @param currentOrientation + * current source-visual editors splitting value + */ + public void fillContainer(boolean useCurrentEditorSettings, String currentOrientation) { /* * https://jira.jboss.org/jira/browse/JBIDE-4152 * @@ -772,9 +783,15 @@ * * Content should be added to a new container. */ + String splitting; + if (useCurrentEditorSettings) { + splitting = currentOrientation; + } else { + splitting = JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + } CustomSashForm newContainer = new CustomSashForm(cmpEd, CustomSashForm - .getSplittingFromPreferences()); - newContainer.setOrientation(CustomSashForm.getSplittingFromPreferences()); + .getSplittingDirection(splitting)); /* * Reset editor's settings. @@ -784,18 +801,13 @@ editorSettings.addSetting(new SashSetting(newContainer)); } newContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - - /* - * Read stored preference settings. - * Correct layout by selecting the order of components adding. - * All three editors should be added to the new container. - */ - if (CustomSashForm.isSourceEditorFirst()) { - sourceContent.setParent(newContainer); - visualContent.setParent(newContainer); + + if (CustomSashForm.isSourceEditorFirst(splitting)) { + sourceContent.setParent(newContainer); + visualContent.setParent(newContainer); } else { - visualContent.setParent(newContainer); - sourceContent.setParent(newContainer); + visualContent.setParent(newContainer); + sourceContent.setParent(newContainer); } previewContent.setParent(newContainer); @@ -825,29 +837,33 @@ int defaultWeight = JspEditorPlugin.getDefault().getPreferenceStore() .getInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS); int[] weights = container.getWeights(); - if (defaultWeight == 0) { - if (CustomSashForm.isSourceEditorFirst()) { - container.maxDown(); - } else { - container.maxUp(); - } - } else if (defaultWeight == 1000) { - if (CustomSashForm.isSourceEditorFirst()) { - container.maxUp(); - } else { - container.maxDown(); - } + if (useCurrentEditorSettings) { + newContainer.setWeights(weights); } else { - if (CustomSashForm.isSourceEditorFirst()) { - weights[0] = 1000 - defaultWeight; - weights[1] = defaultWeight; + if (defaultWeight == 0) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { + container.maxDown(); + } else { + container.maxUp(); + } + } else if (defaultWeight == 1000) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { + container.maxUp(); + } else { + container.maxDown(); + } } else { - weights[0] = defaultWeight; - weights[1] = 1000 - defaultWeight; + if (CustomSashForm.isSourceEditorFirst(splitting)) { + weights[0] = 1000 - defaultWeight; + weights[1] = defaultWeight; + } else { + weights[0] = defaultWeight; + weights[1] = 1000 - defaultWeight; + } + if ((weights != null) && !container.isDisposed()){ + container.setWeights(weights); + } } - if ((weights != null) && !container.isDisposed()){ - container.setWeights(weights); - } } container.setSashBorders(new boolean[] { true, true, true }); @@ -1118,7 +1134,8 @@ public void maximizeSource() { if (container != null) { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING))) { container.maxDown(); } else { container.maxUp(); @@ -1134,7 +1151,8 @@ public void maximizeVisual() { if (container != null) { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING))) { container.maxUp(); } else { container.maxDown(); @@ -1178,7 +1196,7 @@ */ if (getController() != null) { selectionBar.setVisible(selectionBar.getAlwaysVisibleOption()); - fillContainer(); + fillContainer(false, null); getController().getVisualBuilder().setShowInvisibleTags(JspEditorPlugin.getDefault().getPreferenceStore().getBoolean( IVpePreferencesPage.SHOW_NON_VISUAL_TAGS)); getController().getPageContext().getBundle().updateShowBundleUsageAsEL(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-09-25 08:17:28 UTC (rev 17725) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-09-25 11:34:43 UTC (rev 17726) @@ -134,6 +134,7 @@ private static Map<String, String> layoutIcons; private static Map<String, String> layoutNames; private static List<String> layoutValues; + private int currentOrientationIndex = 1; static { layoutIcons = new HashMap<String, String>(); layoutIcons.put(IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE, ICON_ORIENTATION_SOURCE_LEFT); @@ -265,7 +266,7 @@ * https://jira.jboss.org/jira/browse/JBIDE-4152 * Compute initial icon state and add it to the tool bar. */ - int currentOrientationIndex = layoutValues.indexOf(JspEditorPlugin + currentOrientationIndex = layoutValues.indexOf(JspEditorPlugin .getDefault().getPreferenceStore().getString( IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); int newIndx = currentOrientationIndex+1; @@ -285,35 +286,11 @@ * Rotate editors orientation clockwise. Store this new * orientation to the preferences. */ - int currentOrientationIndex = layoutValues - .indexOf(JspEditorPlugin - .getDefault() - .getPreferenceStore() - .getString( - IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); - int newIndx = currentOrientationIndex + 1; - if (newIndx == layoutValues.size()) { - newIndx = newIndx % layoutValues.size(); + currentOrientationIndex++; + if (currentOrientationIndex == layoutValues.size()) { + currentOrientationIndex = currentOrientationIndex % layoutValues.size(); } - String newOrientation = layoutValues.get(newIndx); - JspEditorPlugin.getDefault().getPreferenceStore().setValue( - IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, - newOrientation); - - /* - * Compute next step orientation and display appropriate icon. - */ - currentOrientationIndex = layoutValues - .indexOf(JspEditorPlugin - .getDefault() - .getPreferenceStore() - .getString( - IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); - newIndx = currentOrientationIndex + 1; - if (newIndx == layoutValues.size()) { - newIndx = newIndx % layoutValues.size(); - } - newOrientation = layoutValues.get(newIndx); + String newOrientation = layoutValues.get(currentOrientationIndex); rotateEditorsItem.setImage(ImageDescriptor.createFromFile( MozillaEditor.class, layoutIcons.get(newOrientation)) .createImage()); @@ -322,10 +299,10 @@ * Call <code>filContainer()</code> from VpeEditorPart * to redraw CustomSashForm with new layout. */ - getController().getPageContext().getEditPart().fillContainer(); + getController().getPageContext().getEditPart().fillContainer(true, newOrientation); } }); - + verBar.pack(); return verBar; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-09-25 08:17:28 UTC (rev 17725) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-09-25 11:34:43 UTC (rev 17726) @@ -1154,15 +1154,21 @@ } public void changeOrientation() { - int prefsOrientation = getSplittingFromPreferences(); + int prefsOrientation = getSplittingDirection(JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING)); if (getOrientation() != prefsOrientation) { setOrientation(prefsOrientation); } } - public static int getSplittingFromPreferences() { - String splitting = JspEditorPlugin.getDefault().getPreferenceStore() - .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); + /** + * Computes the splitting style: + * SWT.HORIZONTAL or SWT.VERTICAL + * + * @param splitting source-visual editors splitting value + * @return integer style value + */ + public static int getSplittingDirection(String splitting) { if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE .equalsIgnoreCase(splitting) || IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE @@ -1173,15 +1179,20 @@ } } - public static boolean isSourceEditorFirst() { - boolean sourceEditorFirst = false; - String splitting = JspEditorPlugin.getDefault().getPreferenceStore() - .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); - if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_SOURCE_VALUE + /** + * Checks if the source editor is displayed on the first place, + * i.e. on the top, or to the left. + * + * @param splitting source-visual editors splitting value + * @return <code>true</code> when the source goes first + */ + public static boolean isSourceEditorFirst(String splitting) { + boolean sourceEditorFirst = true; + if (IVpePreferencesPage.SPLITTING_HORIZ_LEFT_VISUAL_VALUE .equalsIgnoreCase(splitting) - || IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE + || IVpePreferencesPage.SPLITTING_VERT_TOP_VISUAL_VALUE .equalsIgnoreCase(splitting)) { - sourceEditorFirst = true; + sourceEditorFirst = false; } return sourceEditorFirst; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java 2009-09-25 08:17:28 UTC (rev 17725) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java 2009-09-25 11:34:43 UTC (rev 17726) @@ -46,20 +46,22 @@ .getInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS); int[] weights = sash.getWeights(); if (weights.length > 2) { + String splitting = JspEditorPlugin.getDefault().getPreferenceStore() + .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING); if (defaultWeight == 0) { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { sash.maxDown(); } else { sash.maxUp(); } } else if (defaultWeight == 1000) { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { sash.maxUp(); } else { sash.maxDown(); } } else { - if (CustomSashForm.isSourceEditorFirst()) { + if (CustomSashForm.isSourceEditorFirst(splitting)) { weights[0] = 1000 - defaultWeight; weights[1] = defaultWeight; } else {

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17725 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: preferences and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2009-09-25 04:17:28 -0400 (Fri, 25 Sep 2009) New Revision: 17725 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/WSILPreferencePage.java Log: JBIDE-4910: BPEL->'WSIL Browser' Preference page cannot load WSIL xml Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2009-09-25 07:38:05 UTC (rev 17724) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2009-09-25 08:17:28 UTC (rev 17725) @@ -225,6 +225,7 @@ public static String BPELPreferencePage_WSIL_MoveUp; public static String BPELPreferencePage_WSIL_OpenInBrowser; public static String BPELPreferencePage_WSIL_DocumentNotLoaded; + public static String BPELPreferencePage_WSIL_NameLimit; public static String BPELPreferencePage_WSIL_EnterLocation; public static String BPELPreferencePage_WSIL_EnterDescription; public static String BPELUIRegistry_Expression_language_editors_must_provide_expressionLanguage_and_class__8; Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2009-09-25 07:38:05 UTC (rev 17724) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2009-09-25 08:17:28 UTC (rev 17725) @@ -119,6 +119,7 @@ BPELPreferencePage_WSIL_Remove = Remove BPELPreferencePage_WSIL_Index = # BPELPreferencePage_WSIL_DocumentNotLoaded = WSIL Document not loaded. +BPELPreferencePage_WSIL_NameLimit = WSIL Document's name should be ended with .wsil BPELPreferencePage_WSIL_MoveDown = Move Down BPELPreferencePage_WSIL_MoveUp = Move Up BPELPreferencePage_WSIL_OpenInBrowser = Open in Browser Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/WSILPreferencePage.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/WSILPreferencePage.java 2009-09-25 07:38:05 UTC (rev 17724) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/WSILPreferencePage.java 2009-09-25 08:17:28 UTC (rev 17725) @@ -102,6 +102,8 @@ Button moveDownButton; Button openInBrowserButton; + private static String WSIL = "wsil"; + // Track the modification of any element in the WSIL model. // we don't use commands and stacks here. EContentAdapter fContentAdapter = new EContentAdapter() { @@ -177,6 +179,7 @@ @Override public void widgetSelected(SelectionEvent e) { FileDialog fd = new FileDialog(getShell(), SWT.OPEN); + fd.setFilterExtensions(new String[]{"*."+WSIL}); String fileName = fd.open(); if ((fileName != null) && (fileName.length() > 0)) { // parse to file url @@ -500,6 +503,10 @@ if (url.length() < 1) { return ; } + if(!url.endsWith(WSIL)){ + setMessage(Messages.BPELPreferencePage_WSIL_NameLimit, ERROR); + return; + } if (fWsilDocument != null) { fWsilDocument.eResource().eAdapters().remove( fContentAdapter ); @@ -511,7 +518,7 @@ Resource resource = null; try { - resource = resourceSet.getResource(uri, true, "wsil"); + resource = resourceSet.getResource(uri, true, WSIL); List contents = resource.getContents();

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17724 - in trunk: bpel/features/org.jboss.tools.bpel.feature and 19 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-09-25 03:38:05 -0400 (Fri, 25 Sep 2009) New Revision: 17724 Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.xml trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.properties trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properties trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.model/build.properties trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.runtimes/build.properties trunk/bpel/plugins/org.eclipse.bpel.validator/.classpath trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties trunk/common/plugins/org.jboss.tools.common.gef/build.properties Log: https://jira.jboss.org/jira/browse/JBIDE-3628 - Plugins should be .jar's not directories for efficiency sake to make Plug-ins were converted to jars: some bpel plug-ins converted to jars Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.xml =================================================================== --- trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.xml 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.xml 2009-09-25 07:38:05 UTC (rev 17724) @@ -14,7 +14,8 @@ %copyright </copyright> - <license>Red Hat, Inc. licenses these features and plugins to you under + <license> + Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, the GNU Lesser General Public License, and/or certain other open source @@ -47,7 +48,8 @@ id="org.jboss.ide.eclipse.archives.core" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin id="org.jboss.ide.eclipse.archives.ui" Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml =================================================================== --- trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2009-09-25 07:38:05 UTC (rev 17724) @@ -1,107 +1,112 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.bpel.feature" - label="%featureName" - version="1.0.0.qualifier" - provider-name="%providerName"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> - - <plugin - id="org.eclipse.bpel.apache.ode.deploy.model" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.bpel.apache.ode.deploy.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.bpel.apache.ode.runtime" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.bpel.common.model" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.eclipse.bpel.common.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.eclipse.bpel.model" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.eclipse.bpel.runtimes" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.eclipse.bpel.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.eclipse.bpel.validator" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.eclipse.bpel.wsil.model" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.eclipse.bpel.xpath10" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.bpel.as.integration" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.bpel.cheatsheet" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.bpel.feature" + label="%featureName" + version="1.0.0.qualifier" + provider-name="%providerName"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + </url> + + <plugin + id="org.eclipse.bpel.apache.ode.deploy.model" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.bpel.apache.ode.deploy.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.bpel.apache.ode.runtime" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.bpel.common.model" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.bpel.common.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.bpel.model" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.bpel.runtimes" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.bpel.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.eclipse.bpel.validator" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.eclipse.bpel.wsil.model" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.eclipse.bpel.xpath10" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.bpel.as.integration" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.bpel.cheatsheet" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,7 +3,6 @@ Bundle-Name: ODE Deploy Descriptor EMF Model Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:=true Bundle-Version: 0.4.0.qualifier -Bundle-ClassPath: . Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -4,12 +4,10 @@ # # $Id: build.properties,v 1.2 2008/11/08 13:59:16 smoser Exp $ -bin.includes = .,\ - model/,\ +bin.includes = model/,\ META-INF/,\ plugin.xml,\ - plugin.properties,\ - bin/ + plugin.properties jars.compile.order = . -source.. = src/ output.. = bin/ +source.. = src/ Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,5 +3,4 @@ bin.includes = plugin.xml,\ META-INF/,\ .,\ - icons/,\ - bin/ + icons/ Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,7 +3,6 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ - bin/,\ definition/,\ icons/,\ plugin.properties Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2009-09-25 07:38:05 UTC (rev 17724) @@ -57,5 +57,4 @@ org.eclipse.emf.ecore.xmi.util", org.eclipse.bpel.names Bundle-Vendor: eclipse.org -Bundle-ClassPath: bin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -1,27 +1,17 @@ -############################################################################### -# Copyright (c) 2005 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are 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: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = META-INF/,\ - plugin.xml,\ - plugin.properties,\ - bin/,\ - bin -src.includes = .classpath,\ - .cvsignore,\ - .project,\ - META-INF/,\ - bin/,\ - build.properties,\ - plugin.properties,\ - src/,\ - plugin.xml -output.code.jar = bin/ -jars.compile.order = code.jar -source.bin = src/ +jars.compile.order = . +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + plugin.properties,\ + plugin.xml,\ + schema/,\ + . +src.includes = .project,\ + .cvsignore,\ + .classpath,\ + META-INF/,\ + build.properties,\ + plugin.properties,\ + plugin.xml,\ + schema/,\ + src/ Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2009-09-25 07:38:05 UTC (rev 17724) @@ -31,4 +31,3 @@ org.eclipse.bpel.common.ui.tray Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: eclipse.org -Bundle-ClassPath: bin Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -12,17 +12,17 @@ plugin.xml,\ schema/,\ icons/,\ - bin/ + . src.includes = .classpath,\ .cvsignore,\ .project,\ META-INF/,\ - bin/,\ build.properties,\ icons/,\ plugin.xml,\ schema/,\ src/ output.code.jar = bin/ -jars.compile.order = code.jar -source.bin = src/ +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java 2009-09-25 07:38:05 UTC (rev 17724) @@ -125,6 +125,7 @@ try { url = new URL(baseURL, ICommonUIConstants.ICON_PATH + id); } catch (MalformedURLException e) { + log(e); } ImageDescriptor desc = ImageDescriptor.createFromURL(url); getImageRegistry().put(id, desc); Modified: trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-09-25 07:38:05 UTC (rev 17724) @@ -30,4 +30,3 @@ org.eclipse.bpel.model.terms, org.eclipse.bpel.model.util Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: bin Modified: trunk/bpel/plugins/org.eclipse.bpel.model/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.model/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -11,8 +11,7 @@ bin.includes = META-INF/,\ plugin.xml,\ plugin.properties,\ - bin/,\ - bin + . src.includes = .classpath,\ .cvsignore,\ .project,\ @@ -23,4 +22,4 @@ plugin.xml,\ src/ jars.compile.order = -source.bin = src/ +source.. = src/ Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2009-09-25 07:38:05 UTC (rev 17724) @@ -29,6 +29,5 @@ org.eclipse.bpel.runtimes.module, org.eclipse.bpel.runtimes.publishers, org.eclipse.bpel.runtimes.ui.wizards -Bundle-ClassPath: bin Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,7 +3,7 @@ icons/,\ plugin.properties,\ bin/,\ - bin + . jars.compile.order = src.includes = META-INF/,\ @@ -16,5 +16,5 @@ .project,\ .cvsignore,\ .classpath -source.bin = src/ +source.. = src/ Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/.classpath =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/.classpath 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/.classpath 2009-09-25 07:38:05 UTC (rev 17724) @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="lib" path="bin" sourcepath="bin"/> - <classpathentry exported="true" kind="lib" path="meta" sourcepath="meta"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2009-09-25 07:38:05 UTC (rev 17724) @@ -20,8 +20,7 @@ javax.wsdl;bundle-version="[1.5.0,1.6.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: bin, - meta/ +Bundle-ClassPath: bpel-validator.jar Export-Package: org.eclipse.bpel.validator, org.eclipse.bpel.validator.adapters, org.eclipse.bpel.validator.factory, Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -5,12 +5,10 @@ *.xml,\ intro/,\ schema/,\ - lib/,\ - bin/,\ - meta/,\ + .,\ src-exclude.xsl jars.compile.order = code.jar,\ - bin/ + bpel-validator.jar src.includes = .classpath,\ .project,\ .settings/,\ @@ -20,22 +18,19 @@ html/,\ icons/,\ intro/,\ - lib/,\ monkey/,\ plugin.xml,\ src/,\ testToc.xml,\ toc.xml,\ schema/,\ - tests/,\ - bin-jaxen/,\ meta/,\ - validatorBuild.xml,\ src-exclude.xsl,\ customBuildCallbacks.xml output.code.jar = bin/ -source.bin/ = src/ -output.bin/ = bin/ +source.bpel-validator.jar = src/,\ + meta/ +output.bpel-validator.jar = bin/ # customBuildCallbacks=customBuildCallbacks.xml # Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/.classpath 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,7 +3,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="lib" path="bin" sourcepath="bin"/> <classpathentry exported="true" kind="lib" path="lib/antlr-runtime-3.0.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2009-09-25 07:38:05 UTC (rev 17724) @@ -3,7 +3,7 @@ Bundle-Name: XPath Parser 1.0 (Incubation) Bundle-SymbolicName: org.eclipse.bpel.xpath10 Bundle-Version: 0.4.0.qualifier -Bundle-ClassPath: ., bin/, +Bundle-ClassPath: ., lib/antlr-runtime-3.0.1.jar Export-Package: org.antlr.runtime;uses:="org.antlr.runtime.tree", org.antlr.runtime.debug;uses:="org.antlr.runtime.tree,org.antlr.runtime", Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -1,6 +1,5 @@ bin.includes = META-INF/,\ lib/,\ - bin/,\ . src.includes = .classpath,\ .project,\ Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -1,4 +1,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + cheatsheets/,\ + plugin.xml Modified: trunk/common/plugins/org.jboss.tools.common.gef/build.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.gef/build.properties 2009-09-25 05:49:39 UTC (rev 17723) +++ trunk/common/plugins/org.jboss.tools.common.gef/build.properties 2009-09-25 07:38:05 UTC (rev 17724) @@ -1,8 +1,7 @@ -bin.includes = plugin.xml,\ - *.jar,\ - .,\ +bin.includes = .,\ META-INF/,\ - plugin.properties + plugin.properties,\ + about.html source.. = resources/,\ src/ jars.compile.order = .

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17723 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-09-25 01:49:39 -0400 (Fri, 25 Sep 2009) New Revision: 17723 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-4917 Hibernate Configuration File (cfg.xml) wizard doesn't initialize 'Driver Class' and 'Connection URL' according to default value 'DB2' selected in "Database Dialect' field fixed by removing combo.select(0); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java 2009-09-25 01:20:03 UTC (rev 17722) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java 2009-09-25 05:49:39 UTC (rev 17723) @@ -148,7 +148,6 @@ label.setText(HibernateConsoleMessages.NewConfigurationWizardPage_database_dialect); dialectCombo = new Combo(container, SWT.NULL); fillHerUp(dialectCombo, helper.getDialectNames() ); - dialectCombo.select(0); gd = new GridData(GridData.FILL_HORIZONTAL); gd.grabExcessHorizontalSpace = true; dialectCombo.setLayoutData(gd);

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17722 - in trunk: jsf/features/org.jboss.tools.richfaces.feature and 15 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-09-24 21:20:03 -0400 (Thu, 24 Sep 2009) New Revision: 17722 Removed: trunk/jsf/plugins/org.jboss.tools.jsf/meta/ Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf/build.properties trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilitiesLoader.java trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web/build.properties trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3628 - Plugins should be .jar's not directories for efficiency sake to make Plug-ins were converted to jars: jsf jsf.ui jst.web jst.web.ui jst.web.tiles jst.web.tiles.ui jst.jsp common.projecttemplates Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java 2009-09-25 01:20:03 UTC (rev 17722) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.common.zip.UnzipOperation; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -45,34 +46,28 @@ copyProjectTemplates(); } - public static String getInstallPath() { + + void copyProjectTemplates() throws IOException { Bundle bundle = Platform.getBundle(PLUGIN_ID); - URL url = null; - try { - url = bundle == null ? null : FileLocator.resolve(bundle.getEntry("/")); //$NON-NLS-1$ - } catch (IOException e) { - url = bundle.getEntry("/"); //$NON-NLS-1$ + File location = Platform.getStateLocation(bundle).toFile(); + File install = FileLocator.getBundleFile(bundle); + if(install.isDirectory()) { + FileFilter filter = new FileFilter() { + public boolean accept(File pathname) { + return pathname != null + && !"CVS".equals(pathname.getName()) //$NON-NLS-1$ + && !".svn".equalsIgnoreCase(pathname.getName()); //$NON-NLS-1$ + } + }; + copy(location, install, "templates", filter); //$NON-NLS-1$ + copy(location, install, "lib", filter); //$NON-NLS-1$ + } else { + UnzipOperation unzip = new UnzipOperation(install); + unzip.execute(location, "templates"); + unzip.execute(location, "lib"); } - return (url == null) ? null : url.getPath(); } - - void copyProjectTemplates() { - Bundle b = Platform.getBundle(PLUGIN_ID); - File location = Platform.getStateLocation(b).toFile(); - File install = new File(getInstallPath()); - if(!install.isDirectory()) return; - FileFilter filter = new FileFilter() { - public boolean accept(File pathname) { - return pathname != null - && !"CVS".equals(pathname.getName()) //$NON-NLS-1$ - && !".svn".equalsIgnoreCase(pathname.getName()); //$NON-NLS-1$ - } - }; - copy(location, install, "templates", filter); //$NON-NLS-1$ - copy(location, install, "lib", filter); //$NON-NLS-1$ - } - private void copy(File location, File install, String name, FileFilter filter) { location = new File(location, name); //if(location.isDirectory()) return; @@ -95,5 +90,4 @@ static public void log(Exception ex) { getDefault().getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, "No message", ex)); //$NON-NLS-1$ } - } \ No newline at end of file Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml =================================================================== --- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,322 +1,330 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.richfaces.feature" - label="%featureName" - version="2.0.0" - provider-name="%providerName" - plugin="org.jboss.tools.vpe"> - - <description url="http://www.jboss.org/tools"> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.richfaces.feature" + label="%featureName" + version="2.0.0" + provider-name="%providerName" + plugin="org.jboss.tools.vpe"> + + <description url="http://www.jboss.org/tools"> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license> Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, the GNU Lesser General Public License, and/or certain other open source licenses. For precise licensing details, consult the corresponding source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, -Raleigh NC 27606 USA. - </license> - - <url> - <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> - - <requires> - <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> - </requires> - - <plugin - id="org.jboss.tools.common" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.gef" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.model" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.model.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.projecttemplates" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.text.ext" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.text.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.verification" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.verification.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.text.ext" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.text.ext.facelets" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.text.ext.richfaces" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.verification" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.vpe.ajax4jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.facelets" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.richfaces" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.seam" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.kb" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.tiles" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.tiles.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.verification" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.vpe" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.ui.palette" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jst.firstrun" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.vpe.xulrunner" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.hibernate.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.hibernate.xml.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.vpe.jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.myfaces" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.html" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.el.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.el.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.resref.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.resref.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.vpe.resref" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.vpe.docbook" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.jstl" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jst.css" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +Raleigh NC 27606 USA. + </license> + + <url> + <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/> + </url> + + <requires> + <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> + </requires> + + <plugin + id="org.jboss.tools.common" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.gef" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.model" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.model.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.projecttemplates" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.text.ext" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.text.xml" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.verification" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.verification.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.text.ext" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.facelets" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.richfaces" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.verification" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.vpe.ajax4jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.facelets" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.richfaces" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.seam" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.jsp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web.kb" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.tiles" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web.tiles.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web.verification" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.ui.palette" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.firstrun" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe.xulrunner" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.hibernate.xml" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.hibernate.xml.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.myfaces" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.html" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.jsp" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.el.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.el.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.resref.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.resref.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe.resref" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe.docbook" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jstl" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.css" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName -Bundle-ClassPath: jsf.jar Bundle-Activator: org.jboss.tools.jsf.JSFModelPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jsf/plugins/org.jboss.tools.jsf/build.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,11 @@ -source.jsf.jar = src/,\ - resources/ bin.includes = plugin.xml,\ META-INF/,\ plugin.properties,\ about.html,\ dtds/,\ - jsf.jar,\ - images/ -jars.compile.order = jsf.jar + images/,\ + . +jars.compile.order = . +output.. = bin/ +source.. = src/,\ + resources/ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -419,7 +419,7 @@ <catalogContribution id="default"> <public publicId="-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - uri="dtds/facelet-taglib_1_0.dtd"/> + uri="platform:/plugin/org.jboss.tools.jsf/dtds/facelet-taglib_1_0.dtd"/> </catalogContribution> </extension> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilitiesLoader.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilitiesLoader.java 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilitiesLoader.java 2009-09-25 01:20:03 UTC (rev 17722) @@ -12,6 +12,7 @@ import java.io.File; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; import org.osgi.framework.Bundle; @@ -39,8 +40,8 @@ String fileLocation = stateLocation + "/templates/JSFCapabilities.xml"; File f = new File(fileLocation); if(!f.exists()) { - String install = ProjectTemplatesPlugin.getInstallPath(); - File source = new File(install, "templates/JSFCapabilities.xml"); + IPath install = ProjectTemplatesPlugin.getTemplateStatePath(); + File source = new File(install.toFile(), "templates/JSFCapabilities.xml"); FileUtil.copyFile(source, f, true); } return f; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName -Bundle-ClassPath: jsfui.jar Bundle-Activator: org.jboss.tools.jsf.ui.JsfUiPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -3,7 +3,10 @@ plugin.properties,\ images/,\ about.html,\ - META-INF/ -source.jsfui.jar = src/,\ - resources/ -jars.compile.order = jsfui.jar + META-INF/,\ + . +jars.compile.order = jsfui.jar,\ + . +output.. = bin/ +source.. = src/,\ + resources/ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: jspeditor.jar Bundle-Activator: org.jboss.tools.jst.jsp.JspEditorPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,12 @@ -source.jspeditor.jar = src/,\ - resources/ bin.includes = templates/,\ plugin.xml,\ plugin.properties,\ images/,\ about.html,\ META-INF/,\ - jspeditor.jar + . src.includes = resources/ +jars.compile.order = . +output.. = bin/ +source.. = resources/,\ + src/ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -124,7 +124,7 @@ <extension point="org.eclipse.ui.editors"> <editor - icon="images/xstudio/editors/jsp.gif" + icon="$nl$/images/xstudio/editors/jsp.gif" class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor" default="true" name="%editors.jsp.name" @@ -138,7 +138,7 @@ class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor" contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor" extensions="html, htm, jsf" - icon="images/xstudio/editors/html_file.gif" + icon="$nl$/images/xstudio/editors/html_file.gif" id="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor" matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl" name="%editors.html.name" @@ -193,8 +193,8 @@ <action class="org.jboss.tools.jst.jsp.outline.cssdialog.OpenCSSDialogActionDelegate" definitionId="org.jboss.tools.jst.jsp.commands.openCSSDialog" - hoverIcon="images/cssdialog/color_large.gif" - icon="images/cssdialog/color_large.gif" + hoverIcon="$nl$/images/cssdialog/color_large.gif" + icon="$nl$/images/cssdialog/color_large.gif" id="org.jboss.tools.jst.jsp.openCSSDialogEditor" label="Open edit dialog" menubarPath="org.jboss.tools.jst.jsp.cssClassDialogSubMenu/content" @@ -496,7 +496,7 @@ <action class="org.jboss.tools.jst.jsp.outline.cssdialog.OpenCSSDialogActionDelegate" definitionId="org.jboss.tools.jst.jsp.commands.openCSSDialog" - icon="images/cssdialog/color_large.gif" + icon="$nl$/images/cssdialog/color_large.gif" id="org.jboss.tools.jst.jsp.openCSSDialogPopupMenu" label="Open CSS Dialog" menubarPath="additions" Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,7 @@ Bundle-ActivationPolicy: lazy Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: web.jar +Bundle-ClassPath: . Bundle-Activator: org.jboss.tools.jst.web.WebModelPlugin Bundle-Vendor: %providerName Plugin-Class: org.jboss.tools.jst.web.WebModelPlugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,11 +1,11 @@ -source.web.jar = src/,\ - resources/ +source.. = src/,\ + resources/ bin.includes = plugin.xml,\ plugin.properties,\ meta/,\ about.html,\ META-INF/,\ - web.jar,\ + .,\ catalog/,\ schema/ additional.bundles = org.eclipse.jem.util Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -271,10 +271,10 @@ <extension point="org.eclipse.wst.xml.core.catalogContributions"> <catalogContribution id="default"> - <uri name="http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" uri="catalog/web-facesconfig_1_2.xsd" /> + <uri name="http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" uri="platform:/plugin/org.jboss.tools.jst.web/catalog/web-facesconfig_1_2.xsd" /> <uri name="http://java.sun.com/xml/ns/javaee/" - uri="catalog/javaee_5.xsd" /> + uri="platform:/plugin/org.jboss.tools.jst.web/catalog/javaee_5.xsd" /> </catalogContribution> </extension> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: web-tiles.jar +Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.tiles;singleton:=true Bundle-Localization: plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,10 @@ -jars.compile.order = web-tiles.jar -source.web-tiles.jar = src/,\ - resources/ -output.web-tiles.jar = /bin +jars.compile.order = . +source.. = src/,\ + resources/ +output.. = /bin src.includes = src/,\ resources/ -bin.includes = web-tiles.jar,\ +bin.includes = .,\ plugin.xml,\ plugin.properties,\ dtds/,\ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -88,8 +88,8 @@ <catalogContribution id="default"> <public publicId="-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" - uri="dtds/tiles_config_1_1.dtd"/> + uri="platform:/plugin/org.jboss.tools.jst.web.tiles/dtds/tiles_config_1_1.dtd"/> </catalogContribution> </extension> -</plugin> \ No newline at end of file +</plugin> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName -Bundle-ClassPath: tilesui.jar +Bundle-ClassPath: . Bundle-Activator: org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.tiles.ui;singleton:=true Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,10 @@ -jars.compile.order = tilesui.jar -source.tilesui.jar = src/,\ - resources/ -output.tilesui.jar = /bin +jars.compile.order = . +source.. = src/,\ + resources/ +output.. = /bin src.includes = src/,\ resources/ -bin.includes = tilesui.jar,\ +bin.includes = .,\ plugin.xml,\ plugin.properties,\ images/,\ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -4,7 +4,7 @@  <extension id="e" name="XML Editors" point="org.jboss.tools.common.model.ui.xmlEditor"> - <xmlEditor class="org.jboss.tools.jst.web.tiles.ui.editor.TilesCompoundEditor" contributorClass="org.jboss.tools.jst.web.tiles.ui.editor.action.TilesMultiPageContributor" entities="FileTiles" icon="images/xstudio/editors/tiles_definition.gif" name="%editors.tiles.name"> + <xmlEditor class="org.jboss.tools.jst.web.tiles.ui.editor.TilesCompoundEditor" contributorClass="org.jboss.tools.jst.web.tiles.ui.editor.action.TilesMultiPageContributor" entities="FileTiles" icon="$nl$/images/xstudio/editors/tiles_definition.gif" name="%editors.tiles.name"> </xmlEditor> </extension> <extension point="org.jboss.tools.common.model.ui.attributeAdapter"> @@ -44,7 +44,7 @@ <extension point="org.eclipse.ui.newWizards"> <category id="org.jboss.tools.struts" name="%NewWizardCat_Struts" parentCategory="org.jboss.tools.jst.web"> </category> - <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.jst.web.tiles.ui.wizard.newfile.NewTilesFileWizard" icon="images/xstudio/wizards/new_tiles_file.gif" id="org.jboss.tools.jst.web.tiles.ui.wizard.newfile.NewTilesFileWizard" name="%new.tiles" project="false"> + <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.jst.web.tiles.ui.wizard.newfile.NewTilesFileWizard" icon="$nl$/images/xstudio/wizards/new_tiles_file.gif" id="org.jboss.tools.jst.web.tiles.ui.wizard.newfile.NewTilesFileWizard" name="%new.tiles" project="false"> <selection class="org.eclipse.core.resources.IResource"> </selection> <description> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,6 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: webui.jar Bundle-Activator: org.jboss.tools.jst.web.ui.WebUiPlugin Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.ui;singleton:=true Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,7 +1,9 @@ -source.webui.jar = src/ bin.includes = plugin.xml,\ plugin.properties,\ images/,\ about.html,\ META-INF/,\ - webui.jar + . +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -30,10 +30,10 @@ class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" entities="FileWebApp,FileWebApp24,FileWebApp25" - icon="images/xstudio/editors/webapp_file.gif" + icon="$nl$/images/xstudio/editors/webapp_file.gif" name="%editors.web.name"> </xmlEditor> - <xmlEditor class="org.jboss.tools.jst.web.ui.editors.TLDCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" entities="FileTLD_PRO,FileTLD_1_2,FileTLD_2_0,FileTLD_2_1" icon="images/xstudio/editors/taglibs_file.gif" name="%editors.tld12.name"> + <xmlEditor class="org.jboss.tools.jst.web.ui.editors.TLDCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" entities="FileTLD_PRO,FileTLD_1_2,FileTLD_2_0,FileTLD_2_1" icon="$nl$/images/xstudio/editors/taglibs_file.gif" name="%editors.tld12.name"> </xmlEditor> </extension> <extension point="org.eclipse.ui.preferencePages"> @@ -44,7 +44,7 @@ <extension point="org.eclipse.ui.editors"> <editor class="org.jboss.tools.jst.web.ui.editors.TLDCompoundEditor" - contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" default="true" extensions="tld" icon="images/xstudio/editors/taglibs_file.gif" + contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" default="true" extensions="tld" icon="$nl$/images/xstudio/editors/taglibs_file.gif" matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl" id="org.jboss.tools.jst.web.ui.editors.TLDCompoundEditor" name="%editors.tld12.name"> @@ -52,7 +52,7 @@ </extension> <extension point="org.eclipse.ui.actionSets">  </extension> @@ -95,7 +95,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_css_file.gif" + icon="$nl$/images/xstudio/wizards/new_css_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard" name="%NewWizard_CSSFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -110,7 +110,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.css.NewCSSClassWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_css_class.gif" + icon="$nl$/images/xstudio/wizards/new_css_class.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSClassWizard" name="%NewWizard_CSSClass" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -125,7 +125,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_js_file.gif" + icon="$nl$/images/xstudio/wizards/new_js_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard" name="%NewWizard_JSFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -140,7 +140,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewWebFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_webapp_file.gif" + icon="$nl$/images/xstudio/wizards/new_webapp_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewWebFileWizard" name="%NewWizard_WebDescriptor" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -155,7 +155,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_jsp_file.gif" + icon="$nl$/images/xstudio/wizards/new_jsp_file.gif" id="org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard" name="%NewWizard_JSPFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -170,7 +170,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_html_file.gif" + icon="$nl$/images/xstudio/wizards/new_html_file.gif" id="org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard" name="%NewWizard_XHTMLFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -185,7 +185,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_html_file.gif" + icon="$nl$/images/xstudio/wizards/new_html_file.gif" id="org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard" name="%NewWizard_HTMLFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -199,7 +199,7 @@ <wizard category="org.jboss.tools.jst.web" class="org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard" - icon="images/xstudio/wizards/new_properties_file.gif" + icon="$nl$/images/xstudio/wizards/new_properties_file.gif" id="org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard" name="%NewWizard_PropertiesFile" project="false"> @@ -213,7 +213,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_taglibs_file.gif" + icon="$nl$/images/xstudio/wizards/new_taglibs_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWizard" name="%NewWizard_TLDFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -229,9 +229,9 @@ <extension id="org.jboss.tools.jst.web.ui.views" name="JBoss Tools" point="org.eclipse.ui.views"> <category id="web.views.category.id" name="%ViewCategory_JBossToolsWeb"> </category> - <view category="web.views.category.id" class="org.jboss.tools.common.model.ui.views.palette.PaletteViewPart" icon="images/xstudio/views/palette.gif" id="org.jboss.tools.common.model.ui.views.palette.PaletteView" name="%paletteViewPart.name"> + <view category="web.views.category.id" class="org.jboss.tools.common.model.ui.views.palette.PaletteViewPart" icon="$nl$/images/xstudio/views/palette.gif" id="org.jboss.tools.common.model.ui.views.palette.PaletteView" name="%paletteViewPart.name"> </view> - <view category="web.views.category.id" class="org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator" icon="images/xstudio/views/web_project.gif" id="org.jboss.tools.jst.web.ui.navigator.WebProjectsView" name="%ViewName_WebProjects"> + <view category="web.views.category.id" class="org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator" icon="$nl$/images/xstudio/views/web_project.gif" id="org.jboss.tools.jst.web.ui.navigator.WebProjectsView" name="%ViewName_WebProjects"> </view> </extension> @@ -309,7 +309,7 @@ </extension> <extension point="org.eclipse.ui.perspectives"> - <perspective class="org.jboss.tools.jst.web.ui.WebDevelopmentPerspectiveFactory" icon="images/xstudio/perspective.png" id="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" name="%perspective.name"> + <perspective class="org.jboss.tools.jst.web.ui.WebDevelopmentPerspectiveFactory" icon="$nl$/images/xstudio/perspective.png" id="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" name="%perspective.name"> </perspective> </extension> @@ -436,7 +436,7 @@ <navigatorContent name="%NavigatorContent_FileContentProvider" priority="normal" - icon="images/xstudio/views/web_project.gif" + icon="$nl$/images/xstudio/views/web_project.gif" activeByDefault="true" contentProvider="org.jboss.tools.jst.web.ui.navigator.XContentProvider" labelProvider="org.jboss.tools.jst.web.ui.navigator.WebProjectsLabelProvider" @@ -470,7 +470,7 @@ <navigatorContent name="%NavigatorContent_ProjectContentProvider" priority="highest" - icon="images/xstudio/views/web_project.gif" + icon="$nl$/images/xstudio/views/web_project.gif" activeByDefault="true" contentProvider="org.jboss.tools.jst.web.ui.navigator.XProjectContentProvider" labelProvider="org.jboss.tools.jst.web.ui.navigator.XLabelProvider"

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17721 - trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-09-24 20:39:53 -0400 (Thu, 24 Sep 2009) New Revision: 17721 Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java Log: fix tests compilation errors Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-24 20:48:08 UTC (rev 17720) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-25 00:39:53 UTC (rev 17721) @@ -82,7 +82,7 @@ StyleAttributes styleAttributes = page.getStyleAttributes(); assertEquals(testedValue, styleAttributes - .getAttribute(TEST_CSS_ATTRIBUTE_NAME)); + .get(TEST_CSS_ATTRIBUTE_NAME)); String[] parsedTestValue = Util.convertExtString(testedValue); @@ -90,7 +90,7 @@ String newTestedValue = parsedTestValue[0] + "." + parsedTestValue[1]; //$NON-NLS-1$ - styleAttributes.getAttributeMap().put(TEST_CSS_ATTRIBUTE_NAME, + styleAttributes.put(TEST_CSS_ATTRIBUTE_NAME, newTestedValue); testedValue = declaration.getPropertyValue(TEST_CSS_ATTRIBUTE_NAME); @@ -107,7 +107,7 @@ newTestedValue = parsedTestValue[0] + "3" + parsedTestValue[1]; //$NON-NLS-1$ try { - styleAttributes.getAttributeMap().put(TEST_CSS_ATTRIBUTE_NAME, + styleAttributes.put(TEST_CSS_ATTRIBUTE_NAME, newTestedValue); } catch (DOMException e) {

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17720 - in trunk/maven/plugins: org.jboss.tools.maven.seam and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2009-09-24 16:48:08 -0400 (Thu, 24 Sep 2009) New Revision: 17720 Added: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java Log: https://jira.jboss.org/jira/browse/JBIDE-4888 Add m2eclipse configurator for portlet facets Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2009-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2009-09-24 20:48:08 UTC (rev 17720) @@ -35,6 +35,9 @@ IProject project = facetedProject.getProject(); IFile pom = project.getFile(IMavenConstants.POM_FILE_NAME); MavenLibraryProviderInstallOperationConfig mavenConfig = (MavenLibraryProviderInstallOperationConfig) config; + if (mavenConfig.getModel() == null) { + return; + } if (pom.exists()) { // JBoss Maven Integration facet has been executed MavenModelManager modelManager = MavenPlugin.getDefault().getMavenModelManager(); Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2009-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2009-09-24 20:48:08 UTC (rev 17720) @@ -8,12 +8,14 @@ org.eclipse.core.runtime, org.jboss.tools.maven.core, org.jboss.tools.seam.core, + org.jboss.tools.portlet.core, org.jboss.tools.seam.ui, org.jboss.tools.common.model, org.maven.ide.components.maven_model_edit, org.eclipse.jst.j2ee.core, org.eclipse.jst.j2ee, - org.eclipse.wst.common.emfworkbench.integration + org.eclipse.wst.common.emfworkbench.integration, + org.eclipse.jst.jsf.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2009-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2009-09-24 20:48:08 UTC (rev 17720) @@ -21,6 +21,13 @@ name="JSF Project configurator" priority="150"/> </extension> + <extension point="org.maven.ide.eclipse.projectConfigurators"> + <configurator + id="org.jboss.tools.maven.portlet.configurator" + class="org.jboss.tools.maven.seam.configurators.PortletProjectConfigurator" + name="Portlet Core Project configurator" priority="155"/> + </extension> + <extension point="org.eclipse.ui.preferencePages"> <page Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-09-24 20:48:08 UTC (rev 17720) @@ -1,14 +1,10 @@ package org.jboss.tools.maven.seam; -import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; import java.net.URL; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Properties; @@ -17,6 +13,7 @@ import org.apache.maven.model.Exclusion; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; +import org.apache.maven.project.MavenProject; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -24,23 +21,23 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.emf.common.util.EList; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.j2ee.application.Application; -import org.eclipse.jst.j2ee.application.EjbModule; -import org.eclipse.jst.j2ee.application.WebModule; -import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit; +import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFramework; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties; +import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.MavenCoreActivator; @@ -80,6 +77,8 @@ public static final String CONFIGURE_SEAM = "configureSeam"; //$NON-NLS-1$ + public static final String CONFIGURE_PORTLET = "configurePortlet"; //$NON-NLS-1$ + public static final boolean CONFIGURE_SEAM_VALUE = true; public static final String CONFIGURE_SEAM_RUNTIME = "configureSeamRuntime"; //$NON-NLS-1$ @@ -93,7 +92,17 @@ public static final String CONFIGURE_JSF = "configureJSF"; //$NON-NLS-1$ public static final boolean CONFIGURE_JSF_VALUE = true; + + public static final boolean CONFIGURE_PORTLET_VALUE = true; + + public static final String CONFIGURE_JSFPORTLET = "configureJSFPortlet"; //$NON-NLS-1$ + public static final boolean CONFIGURE_JSFPORTLET_VALUE = true; + + public static final String CONFIGURE_SEAMPORTLET = "configureSeamPortlet"; //$NON-NLS-1$ + + public static final boolean CONFIGURE_SEAMPORTLET_VALUE = true; + // The shared instance private static MavenSeamActivator plugin; @@ -893,4 +902,27 @@ IStatus status = new Status(IStatus.WARNING, PLUGIN_ID, message, null); getDefault().getLog().log(status); } + + public String getDependencyVersion(MavenProject mavenProject, String gid, String aid) { + List<Dependency> dependencies = mavenProject.getDependencies(); + for (Dependency dependency:dependencies) { + String groupId = dependency.getGroupId(); + if (groupId != null && (groupId.equals(gid)) ) { + String artifactId = dependency.getArtifactId(); + if (artifactId != null && artifactId.equals(aid)) { + return dependency.getVersion(); + } + } + } + return null; + } + + public IDataModel createJSFDataModel(IFacetedProject fproj, IProjectFacetVersion facetVersion) { + IDataModel config = (IDataModel) new JSFFacetInstallDataModelProvider().create(); + LibraryInstallDelegate libraryDelegate = new LibraryInstallDelegate(fproj, facetVersion); + ILibraryProvider provider = LibraryProviderFramework.getProvider("jsf-no-op-library-provider"); //$NON-NLS-1$ + libraryDelegate.setLibraryProvider(provider); + config.setProperty(IJSFFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE, libraryDelegate); + return config; + } } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java 2009-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java 2009-09-24 20:48:08 UTC (rev 17720) @@ -1,68 +1,29 @@ package org.jboss.tools.maven.seam.configurators; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.apache.maven.model.Dependency; import org.apache.maven.project.MavenProject; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.core.runtime.preferences.IScopeContext; -import org.eclipse.emf.common.util.EList; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jst.j2ee.application.Application; -import org.eclipse.jst.j2ee.application.EjbModule; -import org.eclipse.jst.j2ee.application.Module; -import org.eclipse.jst.j2ee.application.WebModule; -import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit; -import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; -import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFramework; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties; +import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider; import org.eclipse.wst.common.componentcore.ModuleCoreNature; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; import org.jboss.tools.maven.seam.MavenSeamActivator; -import org.jboss.tools.seam.core.ISeamProject; -import org.jboss.tools.seam.core.SeamCorePlugin; -import org.jboss.tools.seam.core.SeamUtil; -import org.jboss.tools.seam.core.project.facet.SeamRuntime; -import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; -import org.jboss.tools.seam.core.project.facet.SeamVersion; -import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider; -import org.jboss.tools.seam.ui.wizard.SeamWizardUtils; -import org.maven.ide.eclipse.MavenPlugin; -import org.maven.ide.eclipse.core.IMavenConstants; import org.maven.ide.eclipse.project.IMavenProjectFacade; import org.maven.ide.eclipse.project.MavenProjectChangedEvent; -import org.maven.ide.eclipse.project.MavenProjectManager; import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigurator; import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequest; -import org.osgi.service.prefs.BackingStoreException; public class JSFProjectConfigurator extends AbstractProjectConfigurator { @@ -92,7 +53,6 @@ @Override public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor) throws CoreException { - // adds Seam capabilities if there are Seam dependencies MavenProject mavenProject = request.getMavenProject(); IProject project = request.getProject(); configureInternal(mavenProject,project, monitor); @@ -159,30 +119,28 @@ throws CoreException { if (!fproj.hasProjectFacet(jsfFacet)) { if (jsfVersionString.startsWith("1.1")) { //$NON-NLS-1$ - fproj.installProjectFacet(jsfVersion11, null, monitor); + IDataModel model = MavenSeamActivator.getDefault().createJSFDataModel(fproj,jsfVersion11); + fproj.installProjectFacet(jsfVersion11, model, monitor); } if (jsfVersionString.startsWith("1.2")) { //$NON-NLS-1$ - fproj.installProjectFacet(jsfVersion12, null, monitor); + IDataModel model = MavenSeamActivator.getDefault().createJSFDataModel(fproj,jsfVersion12); + fproj.installProjectFacet(jsfVersion12, model, monitor); } // FIXME if (jsfVersionString.startsWith("2.0")) { //$NON-NLS-1$ - fproj.installProjectFacet(jsfVersion12, null, monitor); + IDataModel model = MavenSeamActivator.getDefault().createJSFDataModel(fproj,jsfVersion12); + fproj.installProjectFacet(jsfVersion12, model, monitor); } } } - + private String getJSFVersion(MavenProject mavenProject) { - List<Dependency> dependencies = mavenProject.getDependencies(); - for (Dependency dependency:dependencies) { - String groupId = dependency.getGroupId(); - if (groupId != null && (JSF_API_GROUP_ID.equals(groupId) || JSF_API2_GROUP_ID.equals(groupId)) ) { - String artifactId = dependency.getArtifactId(); - if (artifactId != null && JSF_API_ARTIFACT_ID.equals(artifactId)) { - return dependency.getVersion(); - } - } - } - return null; + String version = null; + version = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, JSF_API_GROUP_ID, JSF_API_ARTIFACT_ID); + if (version == null) { + version = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, JSF_API2_GROUP_ID, JSF_API_ARTIFACT_ID); + } + return version; } } Added: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java 2009-09-24 20:48:08 UTC (rev 17720) @@ -0,0 +1,168 @@ +package org.jboss.tools.maven.seam.configurators; + +import org.apache.maven.project.MavenProject; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; +import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFramework; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.tools.maven.core.IJBossMavenConstants; +import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; +import org.jboss.tools.maven.seam.MavenSeamActivator; +import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.internal.project.facet.JSFPortletFacetInstallDataModelProvider; +import org.jboss.tools.portlet.core.internal.project.facet.PortletFacetInstallDataModelProvider; +import org.maven.ide.eclipse.project.IMavenProjectFacade; +import org.maven.ide.eclipse.project.MavenProjectChangedEvent; +import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigurator; +import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequest; + +public class PortletProjectConfigurator extends AbstractProjectConfigurator { + + private static final String PORTLET_API_GROUP_ID = "javax.portlet"; //$NON-NLS-1$ + private static final String PORTLET_API_ARTIFACT_ID = "portlet-api"; //$NON-NLS-1$ + + private static final String PORTLETBRIDGE_API_GROUP_ID = "org.jboss.portletbridge"; //$NON-NLS-1$ + private static final String PORTLETBRIDGE_API_ARTIFACT_ID = "portletbridge-api"; //$NON-NLS-1$ + + protected static final IProjectFacet dynamicWebFacet; + protected static final IProjectFacetVersion dynamicWebVersion; + + protected static final IProjectFacet jsfFacet; + protected static final IProjectFacet portletFacet; + protected static final IProjectFacetVersion portletVersion10; + protected static final IProjectFacetVersion portletVersion20; + protected static final IProjectFacet m2Facet; + protected static final IProjectFacetVersion m2Version; + protected static final IProjectFacetVersion jsfportletFacetVersion; + + static { + dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$ + dynamicWebVersion = dynamicWebFacet.getVersion("2.5"); //$NON-NLS-1$ + portletFacet = ProjectFacetsManager.getProjectFacet("jboss.portlet"); //$NON-NLS-1$ + portletVersion20 = portletFacet.getVersion("2.0"); //$NON-NLS-1$ + portletVersion10 = portletFacet.getVersion("1.0"); //$NON-NLS-1$ + m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$ + m2Version = m2Facet.getVersion("1.0"); //$NON-NLS-1$ + jsfFacet = ProjectFacetsManager.getProjectFacet("jst.jsf"); //$NON-NLS-1$ + jsfportletFacetVersion = ProjectFacetsManager.getProjectFacet("jboss.jsfportlet").getVersion("1.0"); //$NON-NLS-1$//$NON-NLS-2$ + } + + @Override + public void configure(ProjectConfigurationRequest request, + IProgressMonitor monitor) throws CoreException { + MavenProject mavenProject = request.getMavenProject(); + IProject project = request.getProject(); + configureInternal(mavenProject,project, monitor); + } + + private void configureInternal(MavenProject mavenProject,IProject project, + IProgressMonitor monitor) throws CoreException { + IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); + boolean configurePortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_PORTLET); + if (!configurePortlet) { + return; + } + + String packaging = mavenProject.getPackaging(); + String portletVersion = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, PORTLET_API_GROUP_ID, PORTLET_API_ARTIFACT_ID); + String jsfportletVersion = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, PORTLETBRIDGE_API_GROUP_ID, PORTLETBRIDGE_API_ARTIFACT_ID); + if (portletVersion != null) { + final IFacetedProject fproj = ProjectFacetsManager.create(project); + if ("war".equals(packaging)) { //$NON-NLS-1$ + installWarFacets(fproj, portletVersion, jsfportletVersion, monitor); + } + } + } + + + @Override + protected void mavenProjectChanged(MavenProjectChangedEvent event, + IProgressMonitor monitor) throws CoreException { + IMavenProjectFacade facade = event.getMavenProject(); + if(facade != null) { + IProject project = facade.getProject(); + if(isWTPProject(project)) { + MavenProject mavenProject = facade.getMavenProject(monitor); + configureInternal(mavenProject, project, monitor); + } + } + super.mavenProjectChanged(event, monitor); + } + + private boolean isWTPProject(IProject project) { + return ModuleCoreNature.getModuleCoreNature(project) != null; + } + + private void installM2Facet(IFacetedProject fproj, IProgressMonitor monitor) throws CoreException { + if (!fproj.hasProjectFacet(m2Facet)) { + IDataModel config = (IDataModel) new MavenFacetInstallDataModelProvider().create(); + config.setBooleanProperty(IJBossMavenConstants.MAVEN_PROJECT_EXISTS, true); + fproj.installProjectFacet(m2Version, config, monitor); + } + } + + + private void installWarFacets(IFacetedProject fproj, String portletVersion, String jsfportletVersion, IProgressMonitor monitor) throws CoreException { + + if (!fproj.hasProjectFacet(dynamicWebFacet)) { + MavenSeamActivator.log("The project doesn't contain the Web Module facet."); + } + installM2Facet(fproj, monitor); + installPortletFacet(fproj, portletVersion, jsfportletVersion, monitor); + } + + + private void installPortletFacet(IFacetedProject fproj, String portletVersionString, String jsfportletVersion, IProgressMonitor monitor) + throws CoreException { + if (!fproj.hasProjectFacet(portletFacet)) { + if (portletVersionString.startsWith("1.0")) { //$NON-NLS-1$ + IDataModel model = createPortletDataModel(fproj, portletVersion10); + fproj.installProjectFacet(portletVersion10, model, monitor); + } + if (portletVersionString.startsWith("2.0")) { //$NON-NLS-1$ + IDataModel model = createPortletDataModel(fproj, portletVersion20); + fproj.installProjectFacet(portletVersion20, model, monitor); + } + } + IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); + boolean configureJSFPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_JSFPORTLET); + if (!configureJSFPortlet) { + return; + } + if (fproj.hasProjectFacet(portletFacet) && fproj.hasProjectFacet(jsfFacet) && jsfportletVersion != null) { + + if (!fproj.hasProjectFacet(jsfportletFacetVersion)) { + IDataModel model = createJSFPortletDataModel(fproj, jsfportletFacetVersion); + fproj.installProjectFacet(jsfportletFacetVersion, model, monitor); + } + + } + } + + private IDataModel createPortletDataModel(IFacetedProject fproj, IProjectFacetVersion facetVersion) { + IDataModel config = (IDataModel) new PortletFacetInstallDataModelProvider().create(); + LibraryInstallDelegate libraryDelegate = new LibraryInstallDelegate(fproj, facetVersion); + ILibraryProvider provider = LibraryProviderFramework.getProvider("portlet-no-op-library-provider"); //$NON-NLS-1$ + libraryDelegate.setLibraryProvider(provider); + config.setProperty(IPortletConstants.PORTLET_LIBRARY_PROVIDER_DELEGATE, libraryDelegate); + return config; + } + + private IDataModel createJSFPortletDataModel(IFacetedProject fproj, IProjectFacetVersion facetVersion) { + IDataModel config = (IDataModel) new JSFPortletFacetInstallDataModelProvider().create(); + LibraryInstallDelegate libraryDelegate = new LibraryInstallDelegate(fproj, facetVersion); + ILibraryProvider provider = LibraryProviderFramework.getProvider("jsfportlet-no-op-library-provider"); //$NON-NLS-1$ + libraryDelegate.setLibraryProvider(provider); + config.setProperty(IPortletConstants.JSFPORTLET_LIBRARY_PROVIDER_DELEGATE, libraryDelegate); + return config; + } +} Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2009-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2009-09-24 20:48:08 UTC (rev 17720) @@ -83,6 +83,10 @@ protected static final IProjectFacet m2Facet; protected static final IProjectFacetVersion m2Version; private static final IProjectFacet seamFacet; + private static final IProjectFacet portletFacet; + private static final IProjectFacet jsfportletFacet; + private static final IProjectFacet seamPortletFacet; + private static final IProjectFacetVersion seamPortletVersion; static { seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam"); //$NON-NLS-1$ @@ -98,6 +102,10 @@ m2Version = m2Facet.getVersion("1.0"); //$NON-NLS-1$ ejbFacet = ProjectFacetsManager.getProjectFacet("jst.ejb"); //$NON-NLS-1$ ejbVersion = ejbFacet.getVersion("3.0"); //$NON-NLS-1$ + portletFacet = ProjectFacetsManager.getProjectFacet("jboss.portlet"); //$NON-NLS-1$ + jsfportletFacet = ProjectFacetsManager.getProjectFacet("jboss.jsfportlet"); //$NON-NLS-1$ + seamPortletFacet = ProjectFacetsManager.getProjectFacet("jboss.seamportlet"); //$NON-NLS-1$ + seamPortletVersion = seamPortletFacet.getVersion("1.0"); //$NON-NLS-1$ } @Override @@ -293,6 +301,16 @@ setModelProperty(model, prefs,ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER); } } + IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); + boolean configureSeamPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAMPORTLET); + if (!configureSeamPortlet) { + return; + } + if (fproj.hasProjectFacet(seamFacet) && fproj.hasProjectFacet(portletFacet) && fproj.hasProjectFacet(jsfportletFacet)) { + if (!fproj.hasProjectFacet(seamPortletFacet)) { + fproj.installProjectFacet(seamPortletVersion, null, monitor); + } + } } private void setModelProperty(IDataModel model, IEclipsePreferences prefs, String property) { @@ -305,7 +323,8 @@ private void installJSFFacet(IFacetedProject fproj, IProgressMonitor monitor) throws CoreException { if (!fproj.hasProjectFacet(jsfFacet)) { - fproj.installProjectFacet(jsfVersion, null, monitor); + IDataModel model = MavenSeamActivator.getDefault().createJSFDataModel(fproj,jsfVersion); + fproj.installProjectFacet(jsfVersion, model, monitor); } } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java 2009-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java 2009-09-24 20:48:08 UTC (rev 17720) @@ -21,6 +21,9 @@ private Button configureSeamRuntimeButton; private Button configureSeamArtifactsButton; private Button configureJSFButton; + private Button configurePortletButton; + private Button configureJSFPortletButton; + private Button configureSeamPortletButton; @Override protected Control createContents(Composite parent) { @@ -63,6 +66,21 @@ boolean configureJSF = store.getBoolean(MavenSeamActivator.CONFIGURE_JSF); configureJSFButton.setSelection(configureJSF); + configurePortletButton = new Button(composite,SWT.CHECK); + configurePortletButton.setText("Configure JBoss Portlet Core facet when importing Maven projects"); + boolean configurePortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_PORTLET); + configurePortletButton.setSelection(configurePortlet); + + configureJSFPortletButton = new Button(composite,SWT.CHECK); + configureJSFPortletButton.setText("Configure JBoss JSF Portlet facet when importing Maven projects"); + boolean configureJSFPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_JSFPORTLET); + configureJSFPortletButton.setSelection(configureJSFPortlet); + + configureSeamPortletButton = new Button(composite,SWT.CHECK); + configureSeamPortletButton.setText("Configure JBoss Seam Portlet facet when importing Maven projects"); + boolean configureSeamPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAMPORTLET); + configureJSFPortletButton.setSelection(configureSeamPortlet); + return composite; } @@ -75,9 +93,15 @@ configureSeamButton.setSelection(MavenSeamActivator.CONFIGURE_SEAM_VALUE); configureSeamRuntimeButton.setSelection(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME_VALUE); configureSeamArtifactsButton.setSelection(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS_VALUE); + configurePortletButton.setSelection(MavenSeamActivator.CONFIGURE_PORTLET_VALUE); + configureJSFPortletButton.setSelection(MavenSeamActivator.CONFIGURE_JSFPORTLET_VALUE); + configureSeamPortletButton.setSelection(MavenSeamActivator.CONFIGURE_SEAMPORTLET_VALUE); IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); store.setValue(MavenSeamActivator.CONFIGURE_SEAM, MavenSeamActivator.CONFIGURE_SEAM_VALUE); store.setValue(MavenSeamActivator.CONFIGURE_JSF, MavenSeamActivator.CONFIGURE_JSF_VALUE); + store.setValue(MavenSeamActivator.CONFIGURE_JSFPORTLET, MavenSeamActivator.CONFIGURE_JSFPORTLET_VALUE); + store.setValue(MavenSeamActivator.CONFIGURE_SEAMPORTLET, MavenSeamActivator.CONFIGURE_SEAMPORTLET_VALUE); + store.setValue(MavenSeamActivator.CONFIGURE_PORTLET, MavenSeamActivator.CONFIGURE_PORTLET_VALUE); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, MavenSeamActivator.CONFIGURE_SEAM_RUNTIME_VALUE); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS_VALUE); configureSeamRuntimeButton.setEnabled(configureSeamButton.getSelection()); @@ -89,7 +113,10 @@ public boolean performOk() { IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); store.setValue(MavenSeamActivator.CONFIGURE_SEAM, configureSeamButton.getSelection()); + store.setValue(MavenSeamActivator.CONFIGURE_PORTLET, configurePortletButton.getSelection()); store.setValue(MavenSeamActivator.CONFIGURE_JSF, configureJSFButton.getSelection()); + store.setValue(MavenSeamActivator.CONFIGURE_JSFPORTLET, configureJSFPortletButton.getSelection()); + store.setValue(MavenSeamActivator.CONFIGURE_SEAMPORTLET, configureSeamPortletButton.getSelection()); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, configureSeamRuntimeButton.getSelection()); store.setValue(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, configureSeamArtifactsButton.getSelection()); return super.performOk(); Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2009-09-24 17:29:48 UTC (rev 17719) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2009-09-24 20:48:08 UTC (rev 17720) @@ -25,6 +25,15 @@ node.putBoolean( MavenSeamActivator.CONFIGURE_JSF, MavenSeamActivator.CONFIGURE_JSF_VALUE); + node.putBoolean( + MavenSeamActivator.CONFIGURE_PORTLET, + MavenSeamActivator.CONFIGURE_PORTLET_VALUE); + node.putBoolean( + MavenSeamActivator.CONFIGURE_JSFPORTLET, + MavenSeamActivator.CONFIGURE_JSFPORTLET_VALUE); + node.putBoolean( + MavenSeamActivator.CONFIGURE_SEAMPORTLET, + MavenSeamActivator.CONFIGURE_SEAMPORTLET_VALUE); } }

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17719 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2009-09-24 13:29:48 -0400 (Thu, 24 Sep 2009) New Revision: 17719 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java Log: RESOLVED - issue JBIDE-4945: VPE Selection Bar: provide the ability to select tags back and forward. https://jira.jboss.org/jira/browse/JBIDE-4945 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-09-24 17:13:17 UTC (rev 17718) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-09-24 17:29:48 UTC (rev 17719) @@ -39,6 +39,7 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; +import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.IWorkbenchGraphicConstants; @@ -76,7 +77,6 @@ private Splitter splitter; - private boolean resizeListenerAdded = false; private VpeController vpeController = null; private ToolBar selBar = null; private FormData selBarData; @@ -95,6 +95,7 @@ private ImageButton arrowButton; private Node currentSelectedNode = null; + private Node currentLastNode = null; // private ToolItem arrowButton; @@ -122,6 +123,11 @@ // Main composite of the visible splitter cmpToolBar = new Composite(splitter, SWT.NONE); cmpToolBar.setLayout(new FormLayout()); + cmpToolBar.addListener(SWT.Resize, new Listener() { + public void handleEvent(Event event) { + updateNodes(true); + } + }); final Image closeImage = PlatformUI.getWorkbench().getSharedImages() .getImage(ISharedImages.IMG_TOOL_DELETE); @@ -307,10 +313,54 @@ if (currentSelectedNode == node && !forceUpdate) { return; - } else { - currentSelectedNode = node; } + final boolean ancestorSelected = isAncestor(node, currentLastNode); + if (ancestorSelected) { + if (forceUpdate) { + // reinitialize selBar with currentLastNode + setSelBarItems(currentLastNode); + } else { + // deselect currentSelectedNode + setNodeSelected(currentSelectedNode, false); + } + } else { + setSelBarItems(node); + currentLastNode = node; + } + + setNodeSelected(node, true); + currentSelectedNode = node; + } + + /** + * Sets the selection state of the given node in the selection bar. + */ + private void setNodeSelected(Node node, boolean selected) { + for (ToolItem item : selBar.getItems()) { + if (item.getData() == node) { + item.setSelection(selected); + return; + } + } + + if (dropDownMenu == null) { + return; + } + + for (MenuItem item : dropDownMenu.getItems()) { + if (item.getData() == node) { + item.setSelection(selected); + return; + } + } + } + + /** + * Cleans {@link #selBar} and adds to it buttons which + * appropriate the {@code node} and all its ancestors. + */ + private void setSelBarItems(Node node) { // bug was fixed when toolbar are not shown for resizeble components cmpToolBar.layout(); splitter.getParent().layout(true, true); @@ -323,11 +373,12 @@ int elementCounter = 0; while (node != null - && (node.getNodeType() == Node.ELEMENT_NODE || node.getNodeType() == Node.COMMENT_NODE)) { + && (node.getNodeType() == Node.ELEMENT_NODE + || node.getNodeType() == Node.COMMENT_NODE)) { addNodeListenerTo(node); if (dropDownMenu == null) { - ToolItem item = new ToolItem(selBar, SWT.FLAT, 1); + ToolItem item = new ToolItem(selBar, SWT.FLAT | SWT.CHECK, 1); item.addSelectionListener(this); item.setData(node); item.setText(node.getNodeName()); @@ -339,7 +390,7 @@ } if (dropDownMenu != null) { - MenuItem menuItem = new MenuItem(dropDownMenu, SWT.PUSH, 0); + MenuItem menuItem = new MenuItem(dropDownMenu, SWT.CHECK, 0); menuItem.addSelectionListener(this); menuItem.setText(node.getNodeName()); menuItem.setData(node); @@ -354,18 +405,28 @@ if (node != null && node.getNodeType() == Node.DOCUMENT_NODE) { addNodeListenerTo(node); } + } - if (!resizeListenerAdded ) { - cmpToolBar.addListener(SWT.Resize, new Listener() { - public void handleEvent(Event event) { - updateNodes(true); - } - }); - resizeListenerAdded = true; + /** + * Checks if the {@code potentialAncestor} is an ancestor of + * {@code potentialAncestor node}. + */ + private boolean isAncestor(Node potentialAncestor, Node node) { + if (potentialAncestor == null || node == null) { + return false; } + + Node curAncestor = node; + while ((curAncestor = curAncestor.getParentNode()) != null) { + if (potentialAncestor == curAncestor) { + return true; + } + } + + return false; } - /** + /** * Deletes all items (except the first item-arrow button) * from the given {@code #toolBar}. */ @@ -478,8 +539,18 @@ } public void widgetSelected(SelectionEvent e) { + Widget widget = e.widget; + + /* ensure that the ToolItem or MenuItem is selected + * (for repeated clicks on the same widget)*/ + if (widget instanceof ToolItem) { + ((ToolItem)widget).setSelection(true); + } else if (widget instanceof MenuItem) { + ((MenuItem)widget).setSelection(true); + } + SelectionUtil.setSourceSelection(vpeController.getPageContext(), - (Node) e.widget.getData()); + (Node) widget.getData()); } public void widgetDefaultSelected(SelectionEvent e) {

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17718 - in trunk/hibernatetools: plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2009-09-24 13:13:17 -0400 (Thu, 24 Sep 2009) New Revision: 17718 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-4873 - fix for clause (7) save inside the workspace Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-09-24 14:56:02 UTC (rev 17717) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-09-24 17:13:17 UTC (rev 17718) @@ -292,29 +292,49 @@ ObjectEditorInput objectEditorInput = (ObjectEditorInput)input; ConsoleConfiguration configuration = objectEditorInput.getConfiguration(); Object obj = objectEditorInput.getObject(); + setPartName(DiagramViewerMessages.DiagramViewer_diagram_for + " " + getDiagramName(obj)); //$NON-NLS-1$ if (obj instanceof RootClass) { RootClass rootClass = (RootClass)obj; - setPartName(DiagramViewerMessages.DiagramViewer_diagram_for + " " + getItemName(rootClass)); //$NON-NLS-1$ ormDiagram = new OrmDiagram(configuration, rootClass); } else if (obj instanceof RootClass[]) { RootClass[] rootClasses = (RootClass[])obj; + ormDiagram = new OrmDiagram(configuration, rootClasses); + } + super.setInput(input); + loadProperties(); + } + + protected String getDiagramName(Object obj) { + String name = ""; //$NON-NLS-1$ + if (obj instanceof RootClass) { + RootClass rootClass = (RootClass)obj; + name = getItemName(rootClass); + } else if (obj instanceof RootClass[]) { + RootClass[] rootClasses = (RootClass[])obj; ArrayList<String> names = new ArrayList<String>(); for (int i = 0; i < rootClasses.length; i++) { names.add(getItemName(rootClasses[i])); } // sort to get same name for same combinations of entities Collections.sort(names); - String name = names.size() > 0 ? names.get(0) : ""; //$NON-NLS-1$ + name = names.size() > 0 ? names.get(0) : ""; //$NON-NLS-1$ for (int i = 1; i < rootClasses.length; i++) { name += " & " + names.get(i); //$NON-NLS-1$ } - setPartName(DiagramViewerMessages.DiagramViewer_diagram_for + " " + name); //$NON-NLS-1$ - ormDiagram = new OrmDiagram(configuration, rootClasses); } - super.setInput(input); - loadProperties(); + return name; } + public String getDiagramName() { + IEditorInput input = getEditorInput(); + Object obj = null; + if (input instanceof ObjectEditorInput) { + ObjectEditorInput objectEditorInput = (ObjectEditorInput)input; + obj = objectEditorInput.getObject(); + } + return getDiagramName(obj); + } + /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-09-24 14:56:02 UTC (rev 17717) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-09-24 17:13:17 UTC (rev 17718) @@ -13,7 +13,12 @@ import java.io.ByteArrayOutputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.SWTGraphics; @@ -21,6 +26,7 @@ import org.eclipse.gef.LayerConstants; import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Device; @@ -28,7 +34,8 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageLoader; -import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.ui.actions.WorkspaceModifyOperation; +import org.eclipse.ui.dialogs.SaveAsDialog; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; @@ -40,7 +47,8 @@ public static final String[] dialogFilterNames = new String[] { DiagramViewerMessages.ExportImageAction_png_format, DiagramViewerMessages.ExportImageAction_jpg_format, DiagramViewerMessages.ExportImageAction_bmp_format }; - private FileDialog saveDialog = null; + //private FileDialog saveDialog = null; + private SaveAsDialog saveDialog = null; private boolean showErrDialog = true; public static final ImageDescriptor img = ImageDescriptor.createFromFile(DiagramViewer.class, "icons/export.png"); //$NON-NLS-1$ @@ -58,7 +66,7 @@ * * @param saveDialog */ - public void setSaveDialog(FileDialog saveDialog) { + public void setSaveDialog(SaveAsDialog saveDialog) { this.saveDialog = saveDialog; } @@ -68,49 +76,76 @@ public void run() { + boolean createdSaveDialog = false; if (saveDialog == null) { - saveDialog = new FileDialog( - getDiagramViewer().getSite().getShell(), SWT.SAVE); + saveDialog = new SaveAsDialog(getDiagramViewer().getSite().getWorkbenchWindow().getShell()); + createdSaveDialog = true; } - saveDialog.setFilterExtensions(dialogFilterExtensions); - saveDialog.setFilterNames(dialogFilterNames); - - String filePath = saveDialog.open(); - saveDialog = null; - if (filePath == null || filePath.trim().length() == 0) { + saveDialog.setOriginalName(getDiagramViewer().getDiagramName()); + saveDialog.open(); + final IPath pathSave = saveDialog.getResult(); + if (pathSave == null) { return; } - IFigure fig = ((ScalableFreeformRootEditPart) getDiagramViewer() + final IFigure fig = ((ScalableFreeformRootEditPart) getDiagramViewer() .getEditPartViewer().getRootEditPart()) .getLayer(LayerConstants.PRINTABLE_LAYERS); - int imageType = SWT.IMAGE_BMP; - if (filePath.toLowerCase().endsWith(".jpg")) { //$NON-NLS-1$ - imageType = SWT.IMAGE_JPEG; - } else if (filePath.toLowerCase().endsWith(".png")) { //$NON-NLS-1$ - imageType = SWT.IMAGE_PNG; - } - FileOutputStream outStream = null; - try { - byte[] imageData = createImage(fig, imageType); - outStream = new FileOutputStream(filePath); - outStream.write(imageData); - outStream.flush(); - } catch (IOException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("ExportImageAction", e); //$NON-NLS-1$ - if (showErrDialog) { - MessageDialog.openInformation(getDiagramViewer().getSite().getShell(), - DiagramViewerMessages.ExportImageAction_error, DiagramViewerMessages.ExportImageAction_failed_to_export_image + e.getMessage()); + int imageTypeTmp = SWT.IMAGE_BMP; + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + String ext = pathSave.getFileExtension(); + if (ext != null) { + ext = ext.toLowerCase(); + if (ext.endsWith("jpg")) { //$NON-NLS-1$ + imageTypeTmp = SWT.IMAGE_JPEG; + } else if (ext.endsWith("png")) { //$NON-NLS-1$ + imageTypeTmp = SWT.IMAGE_PNG; + } else if (ext.endsWith("gif")) { //$NON-NLS-1$ + imageTypeTmp = SWT.IMAGE_GIF; + } else if (ext.endsWith("bmp")) { //$NON-NLS-1$ + imageTypeTmp = SWT.IMAGE_BMP; } } - finally { - if (outStream != null) { + IPath pathTmp = workspace.getRoot().getFullPath().append(pathSave); + pathTmp = workspace.getRoot().getLocation().append(pathTmp); + if (ext == null) { + pathTmp = pathTmp.addFileExtension("bmp"); //$NON-NLS-1$ + } + final IPath path = pathTmp; + final int imageType = imageTypeTmp; + + WorkspaceModifyOperation op = new WorkspaceModifyOperation() { + public void execute(final IProgressMonitor monitor) { + FileOutputStream outStream = null; try { - outStream.close(); + byte[] imageData = createImage(fig, imageType); + outStream = new FileOutputStream(path.toString()); + outStream.write(imageData); + outStream.flush(); } catch (IOException e) { - // ignore + HibernateConsolePlugin.getDefault().logErrorMessage("ExportImageAction", e); //$NON-NLS-1$ + if (showErrDialog) { + MessageDialog.openInformation(getDiagramViewer().getSite().getShell(), + DiagramViewerMessages.ExportImageAction_error, DiagramViewerMessages.ExportImageAction_failed_to_export_image + e.getMessage()); + } } + finally { + if (outStream != null) { + try { + outStream.close(); + } catch (IOException e) { + // ignore + } + } + } } + }; + try { + new ProgressMonitorDialog( + createdSaveDialog ? getDiagramViewer().getSite().getWorkbenchWindow().getShell() : null) + .run(false, true, op); + } catch (InvocationTargetException e) { + } catch (InterruptedException e) { } } Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF 2009-09-24 14:56:02 UTC (rev 17717) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/META-INF/MANIFEST.MF 2009-09-24 17:13:17 UTC (rev 17718) @@ -7,6 +7,7 @@ org.eclipse.wst.common.project.facet.ui;bundle-version="1.3.0", org.eclipse.jdt.core, org.eclipse.gef, + org.eclipse.ui.ide, org.hibernate.eclipse.console.test, org.jboss.tools.hibernate.ui, org.hibernate.eclipse Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.java 2009-09-24 14:56:02 UTC (rev 17717) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/test/ExportImageActionTest.java 2009-09-24 17:13:17 UTC (rev 17718) @@ -12,6 +12,10 @@ import java.io.File; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.SWTGraphics; import org.eclipse.draw2d.geometry.Rectangle; @@ -20,7 +24,7 @@ import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.ui.dialogs.SaveAsDialog; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExportImageAction; import org.jmock.Expectations; @@ -44,24 +48,30 @@ public void testAction() { - final DiagramViewer editor = context.mock(DiagramViewer.class);; - final FileDialog saveDialog = context.mock(FileDialog.class);; - final GraphicalViewer graphicalViewer = context.mock(GraphicalViewer.class);; - final ScalableFreeformRootEditPart scalableFreeformRootEditPart = context.mock(ScalableFreeformRootEditPart.class);; - final IFigure figure = context.mock(IFigure.class);; - final Control control = context.mock(Control.class);; - final Display display = context.mock(Display.class);; + final DiagramViewer editor = context.mock(DiagramViewer.class); + final SaveAsDialog saveDialog = context.mock(SaveAsDialog.class); + final GraphicalViewer graphicalViewer = context.mock(GraphicalViewer.class); + final ScalableFreeformRootEditPart scalableFreeformRootEditPart = context.mock(ScalableFreeformRootEditPart.class); + final IFigure figure = context.mock(IFigure.class); + final Control control = context.mock(Control.class); + final Display display = context.mock(Display.class); final Rectangle rectangle = new Rectangle(0, 0, 20, 10); final String filePath = "test.jpg"; //$NON-NLS-1$ + final IPath resPath = new Path(filePath); context.checking(new Expectations() { { - allowing(saveDialog).setFilterExtensions(ExportImageAction.dialogFilterExtensions); - allowing(saveDialog).setFilterNames(ExportImageAction.dialogFilterNames); + allowing(editor).getDiagramName(); + will(returnValue(filePath)); + allowing(saveDialog).setOriginalName(filePath); + oneOf(saveDialog).open(); - will(returnValue(filePath)); + will(returnValue(0)); + oneOf(saveDialog).getResult(); + will(returnValue(resPath)); + allowing(editor).getSite(); will(returnValue(null)); @@ -99,7 +109,10 @@ exportImageAction.setShowErrDialog(false); exportImageAction.run(); // test is the file created - File file = new File(filePath); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IPath path = workspace.getRoot().getFullPath().append(resPath); + path = workspace.getRoot().getLocation().append(path); + File file = path.toFile(); assertTrue(file.exists() && file.isFile()); // boolean res = file.delete();

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17717 - in trunk/jst/plugins: org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2009-09-24 10:56:02 -0400 (Thu, 24 Sep 2009) New Revision: 17717 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/StyleAttributes.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/BaseTabControl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java Log: https://jira.jboss.org/jira/browse/JBIDE-4940 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -14,7 +14,6 @@ import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.observable.ChangeEvent; import org.eclipse.core.databinding.observable.IChangeListener; -import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -50,8 +49,7 @@ super(tabbedPropertySheetPageContributor); bindingContext = new DataBindingContext(); styleAttributes = new StyleAttributes(); - ((IObservable) styleAttributes.getAttributeMap()) - .addChangeListener(this); + styleAttributes.addChangeListener(this); this.part = part; } @@ -99,7 +97,7 @@ || (!selectedObject.equals(newSelectedObject))) super.selectionChanged(part, selection); selectedObject = newSelectedObject; - + update(); } @@ -109,12 +107,10 @@ public void update() { if (selectedObject instanceof StyleContainer) { - ((IObservable) getStyleAttributes().getAttributeMap()) - .removeChangeListener(this); + getStyleAttributes().removeChangeListener(this); getStyleAttributes().setStyleProperties( ((StyleContainer) selectedObject).getStyleAttributes()); - ((IObservable) getStyleAttributes().getAttributeMap()) - .addChangeListener(this); + getStyleAttributes().addChangeListener(this); } } @@ -125,7 +121,7 @@ ((StyleContainer) selectedObject) .applyStyleAttributes(getStyleAttributes() - .getAttributeMap()); + .getStyleProperties()); } notifySelectionChanged(getCurrentSelection()); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -104,15 +104,14 @@ dialogContainer.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, true)); - ((IObservable) getStyleAttributes().getAttributeMap()) - .addChangeListener(new IChangeListener() { + getStyleAttributes().addChangeListener(new IChangeListener() { - public void handleChange(ChangeEvent event) { - handleStyleChanged(); + public void handleChange(ChangeEvent event) { + handleStyleChanged(); - } + } - }); + }); aggregateStatus = new AggregateValidationStatus( getBindingContext().getValidationStatusProviders(), @@ -230,7 +229,7 @@ StringBuffer html = new StringBuffer(Constants.OPEN_DIV_TAG); for (Map.Entry<String, String> styleItem : getStyleAttributes() - .getAttributeMap().entrySet()) { + .entrySet()) { html.append(styleItem.getKey() + Constants.COLON + styleItem.getValue() + Constants.SEMICOLON); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/StyleAttributes.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/StyleAttributes.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/StyleAttributes.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -14,6 +14,8 @@ import java.util.Set; import java.util.Map.Entry; +import org.eclipse.core.databinding.observable.IChangeListener; +import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.WritableMap; /** @@ -21,7 +23,7 @@ */ public class StyleAttributes { - private Map<String, String> attributeMap = null; + private IObservableMap attributeMap = null; /** * Default constructor. @@ -31,24 +33,16 @@ } /** - * Gets attribute map. - * - * @return map of attributes - */ - public Map<String, String> getAttributeMap() { - return attributeMap; - } - - /** * Add attribute with the given name and value. * * @param name + * * the name of attribute * @param value * the value of attribute */ - public void addAttribute(String name, String value) { - attributeMap.put(name, value); + public String put(String name, String value) { + return (String) attributeMap.put(name.toLowerCase(), value); } /** @@ -57,8 +51,8 @@ * @param name * the name of attribute to be removed */ - public void removeAttribute(String name) { - attributeMap.remove(name); + public void remove(String name) { + attributeMap.remove(name.toLowerCase()); } /** @@ -75,8 +69,8 @@ * the name of attribute to be returned * @return attribute value */ - public String getAttribute(String name) { - String value = attributeMap.get(name); + public String get(Object name) { + String value = (String) attributeMap.get(name); return value != null ? value : Constants.EMPTY; } @@ -99,9 +93,17 @@ */ public void setStyleProperties(Map<String, String> properties) { attributeMap.clear(); - attributeMap.putAll(properties); + + for (Entry<String, String> entry : properties.entrySet()) { + attributeMap.put(entry.getKey().toLowerCase(), entry.getValue()); + } + } + public Map<String, String> getStyleProperties() { + return attributeMap; + } + /** * String representation of style attributes. * @@ -118,4 +120,17 @@ } return buf.toString(); } + + public IObservableMap getObservableMap() { + return attributeMap; + } + + public void addChangeListener(IChangeListener listener) { + attributeMap.addChangeListener(listener); + } + + public void removeChangeListener(IChangeListener listener) { + attributeMap.removeChangeListener(listener); + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -100,7 +100,7 @@ for (String str : set) { ArrayList<String> list = elementMap.get(str); - if(list.contains(name)) { + if(list.contains(name.toLowerCase())) { return true; } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/BaseTabControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/BaseTabControl.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/BaseTabControl.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -16,7 +16,6 @@ import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.UpdateValueStrategy; import org.eclipse.core.databinding.observable.Observables; -import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IAdaptable; @@ -270,10 +269,10 @@ List<String> values = CSSConstants.CSS_STYLE_VALUES_MAP .get(attribute); - + if ((values != null) && !values.contains(value)) value = adjustBackgroundURL((String) value); - + return super.doSet(observableValue, value); } }, null); @@ -464,9 +463,8 @@ } private IObservableValue createAttributeObservableValue(String attributeName) { - return Observables.observeMapEntry( - (IObservableMap) getStyleAttributes().getAttributeMap(), - attributeName, String.class); + return Observables.observeMapEntry(getStyleAttributes() + .getObservableMap(), attributeName, String.class); } private void bind(Widget widget, String attribute) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java 2009-09-24 13:53:59 UTC (rev 17716) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java 2009-09-24 14:56:02 UTC (rev 17717) @@ -61,7 +61,7 @@ for (String key : listKeys) { - String value = getStyleAttributes().getAttribute(key); + String value = getStyleAttributes().get(key); if (value != null && value.length() > 0) { addLabel(this, key); createControl(this, key);

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2009