JBoss Tools SVN: r22889 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-18 13:55:17 -0400 (Fri, 18 Jun 2010)
New Revision: 22889
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
Log:
try/catch removed, because there are no declared exceptions in code inside it
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 2010-06-18 17:08:08 UTC (rev 22888)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-06-18 17:55:17 UTC (rev 22889)
@@ -646,12 +646,8 @@
}
public void completed(ProgressEvent event) {
- try{
MozillaEditor.this.onLoadWindow();
xulRunnerEditor.getBrowser().removeProgressListener(this);
- } catch(Exception ex){
- VpePlugin.getPluginLog().logError(ex);
- }
}
});
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22888 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-18 13:08:08 -0400 (Fri, 18 Jun 2010)
New Revision: 22888
Modified:
trunk/build/publish.sh
Log:
fix unzip flag order
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-18 16:55:16 UTC (rev 22887)
+++ trunk/build/publish.sh 2010-06-18 17:08:08 UTC (rev 22888)
@@ -7,13 +7,14 @@
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
for z in ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/sources/site/target/site_assembly.zip; do
if [[ -f $z ]]; then
+ echo "$z ..."
# note the job name, build number, and build ID of the latest snapshot zip
echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt
echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt
# unzip into workspace for publishing as unpacked site
- unzip $z -fo -q -d ${WORKSPACE}/site/${JOB_NAME}/
+ unzip -f -o -q -d ${WORKSPACE}/site/${JOB_NAME}/ $z
# copy into workspace for access by bucky aggregator (same name every time)
rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
@@ -23,7 +24,7 @@
# if zips exist produced & renamed by ant script, copy them too
for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip"); do
echo "$z ..."
- unzip $z -fo -q -d ${WORKSPACE}/site/${JOB_NAME}/
+ unzip -f -o -q -d ${WORKSPACE}/site/${JOB_NAME}/ $z
rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
done
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22887 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-18 12:55:16 -0400 (Fri, 18 Jun 2010)
New Revision: 22887
Modified:
trunk/build/target-platform/e36-wtp32-svn.target
trunk/build/target-platform/e36-wtp32.target
Log:
update tptp/wtp feature version, add two new tptp features + tptp 4.7 site
Modified: trunk/build/target-platform/e36-wtp32-svn.target
===================================================================
--- trunk/build/target-platform/e36-wtp32-svn.target 2010-06-18 16:05:51 UTC (rev 22886)
+++ trunk/build/target-platform/e36-wtp32-svn.target 2010-06-18 16:55:16 UTC (rev 22887)
@@ -16,7 +16,7 @@
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100609-1954-35-7w3121171A02A65"/>
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -95,6 +95,8 @@
<unit id="org.eclipse.rap.tooling.feature.group" version="1.3.0.20100608-1607"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.0.v20100526-46-9oB5855H7H"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
+<unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.0.v201005032111-797A-8s73533E4E6E33"/>
+<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.0.v201005032111-7H7F-AkF7B77R7VBV77"/>
<repository location="http://download.eclipse.org/releases/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -107,6 +109,9 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
+</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
</target>
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-06-18 16:05:51 UTC (rev 22886)
+++ trunk/build/target-platform/e36-wtp32.target 2010-06-18 16:55:16 UTC (rev 22887)
@@ -16,7 +16,7 @@
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100609-1954-35-7w3121171A02A65"/>
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -71,6 +71,8 @@
<unit id="org.eclipse.rap.tooling.feature.group" version="1.3.0.20100608-1607"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.0.v20100526-46-9oB5855H7H"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
+<unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.0.v201005032111-797A-8s73533E4E6E33"/>
+<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.0.v201005032111-7H7F-AkF7B77R7VBV77"/>
<repository location="http://download.eclipse.org/releases/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -83,6 +85,9 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<repository location="http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/"/>
+</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
</target>
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22886 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-18 12:05:51 -0400 (Fri, 18 Jun 2010)
New Revision: 22886
Modified:
trunk/build/publish.sh
Log:
check for site_assembly.zip too
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-18 15:53:14 UTC (rev 22885)
+++ trunk/build/publish.sh 2010-06-18 16:05:51 UTC (rev 22886)
@@ -5,23 +5,25 @@
SNAPNAME=${JOB_NAME}-Update-SNAPSHOT.zip
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
-if [[ -f ${WORKSPACE}/sources/site/target/site.zip ]]; then
- # note the job name, build number, and build ID of the latest snapshot zip
- echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
- echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt
- echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt
+for z in ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/sources/site/target/site_assembly.zip; do
+ if [[ -f $z ]]; then
+ # note the job name, build number, and build ID of the latest snapshot zip
+ echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
+ echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt
+ echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt
- # unzip into workspace for publishing as unpacked site
- unzip -q ${WORKSPACE}/sources/site/target/site.zip -d ${WORKSPACE}/site/${JOB_NAME}/
+ # unzip into workspace for publishing as unpacked site
+ unzip $z -fo -q -d ${WORKSPACE}/site/${JOB_NAME}/
- # copy into workspace for access by bucky aggregator (same name every time)
- rsync -aq ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME}
-fi
+ # copy into workspace for access by bucky aggregator (same name every time)
+ rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
+ fi
+done
# if zips exist produced & renamed by ant script, copy them too
for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip"); do
echo "$z ..."
- unzip -q $z -d ${WORKSPACE}/site/${JOB_NAME}/
+ unzip $z -fo -q -d ${WORKSPACE}/site/${JOB_NAME}/
rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
done
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22885 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-18 11:53:14 -0400 (Fri, 18 Jun 2010)
New Revision: 22885
Modified:
trunk/build/publish.sh
Log:
support Athena builds' output better
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-18 15:12:56 UTC (rev 22884)
+++ trunk/build/publish.sh 2010-06-18 15:53:14 UTC (rev 22885)
@@ -19,8 +19,10 @@
fi
# if zips exist produced & renamed by ant script, copy them too
-for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 4 -name "*Update*.zip"); do
- rsync -aq $z ${WORKSPACE}/site/${JOB_NAME}/
+for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip"); do
+ echo "$z ..."
+ unzip -q $z -d ${WORKSPACE}/site/${JOB_NAME}/
+ rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
done
# publish to download.jboss.org
@@ -31,4 +33,4 @@
if [[ -f ${WORKSPACE}/site/${SNAPNAME} ]]; then
# publish snapshot zip
rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/
-fi
\ No newline at end of file
+fi
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22884 - in branches/jbosstools-3.1.x/hibernatetools: tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-06-18 11:12:56 -0400 (Fri, 18 Jun 2010)
New Revision: 22884
Removed:
branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionPulldownDelegate.java
Modified:
branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java
branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
branches/jbosstools-3.1.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6468 - fix for brunch 3.1.x
Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java
===================================================================
--- branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java 2010-06-18 15:08:53 UTC (rev 22883)
+++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java 2010-06-18 15:12:56 UTC (rev 22884)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.hibernate.eclipse.jdt.ui.internal.jpa.actions;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -17,6 +19,10 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.expressions.EvaluationContext;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
@@ -39,14 +45,15 @@
public class JPAMapToolActionDelegate extends AbstractHandler implements IObjectActionDelegate,
IEditorActionDelegate, IViewActionDelegate {
- public JPAMapToolActor actor = JPAMapToolActor.getInstance();
+ protected JPAMapToolActor actor = new JPAMapToolActor();
+ protected WeakReference<Object> refContextObject = null;
+
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
}
public void run(IAction action) {
- actor.updateSelected(Integer.MAX_VALUE);
- //actor.updateOpen();
+ runInternal();
}
public void selectionChanged(IAction action, ISelection selection) {
@@ -63,11 +70,17 @@
}
public Object execute(ExecutionEvent event) throws ExecutionException {
- actor.updateSelected(Integer.MAX_VALUE);
- //actor.updateOpen();
+ runInternal();
return null;
}
+ public void runInternal() {
+ if (refContextObject != null) {
+ processContextObjectElements();
+ }
+ actor.updateSelected(Integer.MAX_VALUE);
+ }
+
public void init(IViewPart view) {
}
public boolean isCUSelected() {
@@ -86,28 +99,77 @@
return false;
}
- @SuppressWarnings("unchecked")
public void setEnabled(Object evaluationContext) {
- boolean enable = false;
- actor.setSelection(null);
- actor.clearSelectionCU();
- if (!enable && evaluationContext instanceof EvaluationContext) {
+ if (evaluationContext instanceof EvaluationContext) {
EvaluationContext ec = (EvaluationContext)evaluationContext;
Object obj = ec.getDefaultVariable();
- if (obj instanceof List) {
- Iterator it = ((List)obj).iterator();
- while (it.hasNext()) {
- obj = it.next();
- actor.processJavaElements(obj);
+ refContextObject = new WeakReference<Object>(obj);
+ } else {
+ refContextObject = null;
+ }
+ setBaseEnabled(checkEnabled());
+ }
+
+ protected boolean checkEnabled() {
+ boolean enable = false;
+ Object obj = refContextObject != null ? refContextObject.get() : null;
+ if (obj == null) {
+ return enable;
+ }
+ List<?> list = null;
+ if (obj instanceof List) {
+ list = (List<?>)obj;
+ } else {
+ list = Collections.singletonList(obj);
+ }
+ Iterator<?> it = list.iterator();
+ while (it.hasNext() && !enable) {
+ Object obj2 = it.next();
+ if (!(obj2 instanceof IJavaElement)) {
+ continue;
+ }
+ int kind = IPackageFragmentRoot.K_SOURCE;
+ if (obj2 instanceof IPackageFragment) {
+ IPackageFragment pf = (IPackageFragment)obj2;
+ try {
+ kind = pf.getKind();
+ } catch (JavaModelException e) {
+ kind = IPackageFragmentRoot.K_BINARY;
}
- } else {
- actor.processJavaElements(obj);
+ } else if (obj2 instanceof IPackageFragmentRoot) {
+ IPackageFragmentRoot pfr = (IPackageFragmentRoot)obj2;
+ try {
+ kind = pfr.getKind();
+ } catch (JavaModelException e) {
+ kind = IPackageFragmentRoot.K_BINARY;
+ }
}
- enable = actor.getSelectionCUSize() > 0;
+ if (kind == IPackageFragmentRoot.K_SOURCE) {
+ enable = true;
+ }
}
if (!enable) {
enable = isCUSelected();
}
- setBaseEnabled(enable);
+ return enable;
}
+
+ public void processContextObjectElements() {
+ actor.setSelection(null);
+ actor.clearSelectionCU();
+ Object obj = refContextObject != null ? refContextObject.get() : null;
+ if (obj == null) {
+ return;
+ }
+ if (obj instanceof List) {
+ @SuppressWarnings("rawtypes")
+ Iterator it = ((List)obj).iterator();
+ while (it.hasNext()) {
+ obj = it.next();
+ actor.processJavaElements(obj);
+ }
+ } else {
+ actor.processJavaElements(obj);
+ }
+ }
}
Deleted: branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionPulldownDelegate.java
===================================================================
--- branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionPulldownDelegate.java 2010-06-18 15:08:53 UTC (rev 22883)
+++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionPulldownDelegate.java 2010-06-18 15:12:56 UTC (rev 22884)
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.hibernate.eclipse.jdt.ui.internal.jpa.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
-import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages;
-
-/**
- * Context menu action delegate for "Generate Hibernate/JPA annotations..."
- *
- * @author Vitali
- */
-public class JPAMapToolActionPulldownDelegate implements
- IWorkbenchWindowPulldownDelegate2, IEditorActionDelegate, IActionDelegate2, IMenuCreator {
-
- /**
- * The menu created by this action
- */
- private Menu fMenu;
- protected boolean fRecreateMenu = false;
-
- public JPAMapToolActor actor = JPAMapToolActor.getInstance();
-
- public Menu getMenu(Menu parent) {
- setMenu(new Menu(parent));
- fillMenu(fMenu);
- initMenu();
- return fMenu;
- }
-
- public Menu getMenu(Control parent) {
- setMenu(new Menu(parent));
- fillMenu(fMenu);
- initMenu();
- return fMenu;
- }
-
- public void dispose() {
- setMenu(null);
- }
-
- public void init(IWorkbenchWindow window) {
- }
-
- public void run(IAction action) {
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- actor.setSelection(selection);
- if (action != null) {
- action.setEnabled(actor.getSelectedSourceSize() > 0);
- }
- }
-
- protected void addToMenu(Menu menu, IAction action, int accelerator) {
- StringBuffer label = new StringBuffer();
- if (accelerator >= 0 && accelerator < 10) {
- // add the numerical accelerator
- label.append('&');
- label.append(accelerator);
- label.append(' ');
- }
- label.append(action.getText());
- action.setText(label.toString());
- ActionContributionItem item = new ActionContributionItem(action);
- item.fill(menu, -1);
- }
-
- protected void fillMenu(Menu menu) {
- IAction action = new Action(JdtUiMessages.JPAMapToolActionPulldownDelegate_menu) {
- public void run() {
- //actor.updateOpen();
- actor.updateSelected(Integer.MAX_VALUE);
- }
- };
- addToMenu(menu, action, -1);
- }
-
- private void initMenu() {
- // Add listener to re-populate the menu each time
- // it is shown because of dynamic list
- fMenu.addMenuListener(new MenuAdapter() {
- public void menuShown(MenuEvent e) {
- Menu m = (Menu) e.widget;
- if (fRecreateMenu) {
- MenuItem[] items = m.getItems();
- for (int i = 0; i < items.length; i++) {
- items[i].dispose();
- }
- fillMenu(m);
- fRecreateMenu = false;
- }
- m.setEnabled(actor.getSelectedSourceSize() > 0);
- MenuItem[] items = m.getItems();
- for (int i = 0; i < items.length; i++) {
- items[i].setEnabled(actor.getSelectedSourceSize() > 0);
- }
- }
- public void menuHidden(MenuEvent e) {
- fRecreateMenu = true;
- }
- });
- }
-
- private void setMenu(Menu menu) {
- if (fMenu != null) {
- fMenu.dispose();
- }
- fMenu = menu;
- }
-
- public void setActiveEditor(IAction action, IEditorPart targetEditor) {
- if (action != null) {
- action.setEnabled(actor.getSelectedSourceSize() > 0);
- }
- }
-
- public void init(IAction action) {
- if (action instanceof Action) {
- ((Action)action).setMenuCreator(this);
- }
- }
-
- public void runWithEvent(IAction action, Event event) {
- //actor.updateOpen();
- actor.updateSelected(Integer.MAX_VALUE);
- }
-
-}
Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2010-06-18 15:08:53 UTC (rev 22883)
+++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2010-06-18 15:12:56 UTC (rev 22884)
@@ -52,7 +52,6 @@
/**
* Actor to execute annotation generation.
- * It is singleton.
*
* @author Vitali Yemialyanchyk
*/
@@ -60,10 +59,6 @@
public class JPAMapToolActor {
/**
- * instance
- */
- private static JPAMapToolActor actor = null;
- /**
* selection - start point to generate annotations
* could be java file, list of files, package, project, some other?
*/
@@ -82,7 +77,7 @@
*/
protected AllEntitiesProcessor processor = new AllEntitiesProcessor();
- protected JPAMapToolActor() {
+ public JPAMapToolActor() {
initPreferences();
}
@@ -90,13 +85,6 @@
processor.initPreferences();
}
- public static JPAMapToolActor getInstance() {
- if (actor == null) {
- actor = new JPAMapToolActor();
- }
- return actor;
- }
-
/**
* Cleanup collection of selected elements for processing
*/
Modified: branches/jbosstools-3.1.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java
===================================================================
--- branches/jbosstools-3.1.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java 2010-06-18 15:08:53 UTC (rev 22883)
+++ branches/jbosstools-3.1.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java 2010-06-18 15:12:56 UTC (rev 22884)
@@ -37,7 +37,6 @@
*
* @author Vitali Yemialyanchyk
*/
-@SuppressWarnings("restriction")
public class JPAMapMockTests extends TestCase {
@@ -72,7 +71,7 @@
public void testJPAMapToolActor() {
- final JPAMapToolActor jpaMapToolActor = JPAMapToolActor.getInstance();
+ final JPAMapToolActor jpaMapToolActor = new JPAMapToolActor();
final AllEntitiesProcessor allEntitiesProcessor = context.mock(AllEntitiesProcessor.class);
final AllEntitiesInfoCollector allEntitiesInfoCollector = context.mock(AllEntitiesInfoCollector.class);
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22883 - in branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta: impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-18 11:08:53 -0400 (Fri, 18 Jun 2010)
New Revision: 22883
Modified:
branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintImpl.java
branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintJavaName.java
branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-6295
Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintImpl.java
===================================================================
--- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintImpl.java 2010-06-18 14:36:27 UTC (rev 22882)
+++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintImpl.java 2010-06-18 15:08:53 UTC (rev 22883)
@@ -11,13 +11,23 @@
package org.jboss.tools.common.meta.constraint.impl;
import org.w3c.dom.*;
+import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.meta.constraint.*;
import org.jboss.tools.common.meta.impl.*;
public class XAttributeConstraintImpl extends XMetaElementImpl implements XAttributeConstraint {
+ /**
+ * It happens that some data useful for constraint, e.g. that attribute is required,
+ * is contained at the attribute object.
+ */
+ protected XAttribute attribute;
public XAttributeConstraintImpl() {}
+ public void setAttribute(XAttribute attribute) {
+ this.attribute = attribute;
+ }
+
public boolean accepts(String value){
return true;
}
@@ -36,4 +46,3 @@
}
}
-
Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintJavaName.java
===================================================================
--- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintJavaName.java 2010-06-18 14:36:27 UTC (rev 22882)
+++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintJavaName.java 2010-06-18 15:08:53 UTC (rev 22883)
@@ -65,7 +65,7 @@
}
public String getError(String value) {
- return (value.length() == 0) ? ModelMessages.CONSTRAINT_NONEMPTY :
+ return (value.length() == 0) ? (isRequired() ? ModelMessages.CONSTRAINT_NONEMPTY : null) :
accepts(value) ? null :
(keytable.contains(value)) ? ModelMessages.CONSTRAINT_NO_JAVA_KEYWORD :
(!allowPrimitiveTypes && primitiveSet.contains(value)) ? ModelMessages.CONSTRAINT_NO_JAVA_KEYWORD :
@@ -73,6 +73,10 @@
ModelMessages.CONSTRAINT_JAVA_NAME;
}
+ boolean isRequired() {
+ return attribute != null && "always".equals(attribute.getProperty("save")); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
public String getCorrectedValue(String value) {
if(value == null || value.length() == 0) return null;
if(XModelObjectConstants.TRUE.equals(getProperties().getProperty("acceptIncorrect"))) return value; //$NON-NLS-1$
@@ -91,4 +95,3 @@
}
-
Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java
===================================================================
--- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java 2010-06-18 14:36:27 UTC (rev 22882)
+++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java 2010-06-18 15:08:53 UTC (rev 22883)
@@ -23,7 +23,7 @@
protected XAttributeEditor m_Editor;
protected String m_DefValue;
protected boolean m_Visible;
- protected ConstraintHolder constraint = new ConstraintHolder();
+ protected ConstraintHolder constraint = new ConstraintHolder(this);
protected boolean m_Required;
protected boolean m_Editable;
protected boolean trimmable;
@@ -256,11 +256,14 @@
}
class ConstraintHolder {
+ XAttributeImpl attribute;
private XAttributeConstraint constraint;
private String loader;
private Element element;
- public ConstraintHolder() {}
+ public ConstraintHolder(XAttributeImpl attribute) {
+ this.attribute = attribute;
+ }
public void init(String loader, Element element) {
this.loader = loader;
@@ -291,6 +294,9 @@
}
if(constraint == null) constraint = new XAttributeConstraintImpl();
+ if(constraint instanceof XAttributeConstraintImpl) {
+ ((XAttributeConstraintImpl)constraint).setAttribute(attribute);
+ }
if(element != null)
((XAttributeConstraintImpl)constraint).load(element);
loader = null;
@@ -298,4 +304,4 @@
this.constraint = constraint;
}
-}
+}
\ No newline at end of file
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22882 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.model/META-INF and 20 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-06-18 10:36:27 -0400 (Fri, 18 Jun 2010)
New Revision: 22882
Added:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml
Removed:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-20100611.170738-20.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-20100611.170738-18.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-20100611.170738-16.jar
Modified:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.project
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml
Log:
Fixing up runtime classloading issues for the model
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project 2010-06-18 14:36:27 UTC (rev 22882)
@@ -25,4 +25,16 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>SMOOKS_CORE_SRC</name>
+ <type>2</type>
+ <locationURI>SMOOKS_CORE_SRC</locationURI>
+ </link>
+ <link>
+ <name>SMOOKS_JAVABEAN_SRC</name>
+ <type>2</type>
+ <locationURI>SMOOKS_JAVABEAN_SRC</locationURI>
+ </link>
+ </linkedResources>
</projectDescription>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-18 14:36:27 UTC (rev 22882)
@@ -15,3 +15,4 @@
org.jboss.tools.smooks.model.csv,
org.jboss.tools.smooks.model.javabean,
org.jboss.tools.smooks.model.plugin
+Bundle-ClassPath: .
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar
===================================================================
(Binary files differ)
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-18 14:36:27 UTC (rev 22882)
@@ -22,7 +22,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.util.List;
+import java.util.Properties;
+import org.milyn.SmooksException;
import org.milyn.javabean.dynamic.Model;
import org.milyn.javabean.dynamic.ModelBuilder;
import org.xml.sax.SAXException;
@@ -36,10 +39,18 @@
*/
public class SmooksModelBuilder {
- private ModelBuilder modelBuilder;
-
- public SmooksModelBuilder() throws SAXException, IOException {
- modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false);
+ private static ModelBuilder modelBuilder;
+
+ static {
+ ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(SmooksModelBuilder.class.getClassLoader());
+ modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false);
+ } catch (Exception e) {
+ throw new SmooksException("Failed to create ModelBuilder instance for descriptor '" + SmooksModel.MODEL_DESCRIPTOR + "'.", e);
+ } finally {
+ Thread.currentThread().setContextClassLoader(contextClassloader);
+ }
}
public ModelBuilder getModelBuilder() {
@@ -47,10 +58,22 @@
}
public Model<SmooksModel> readModel(InputStream configStream) throws SAXException, IOException {
- return modelBuilder.readModel(configStream, SmooksModel.class);
+ ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(SmooksModelBuilder.class.getClassLoader());
+ return modelBuilder.readModel(configStream, SmooksModel.class);
+ } finally {
+ Thread.currentThread().setContextClassLoader(contextClassloader);
+ }
}
public Model<SmooksModel> readModel(Reader configStream) throws SAXException, IOException {
- return modelBuilder.readModel(configStream, SmooksModel.class);
+ ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(SmooksModelBuilder.class.getClassLoader());
+ return modelBuilder.readModel(configStream, SmooksModel.class);
+ } finally {
+ Thread.currentThread().setContextClassLoader(contextClassloader);
+ }
}
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl 2010-06-18 14:36:27 UTC (rev 22882)
@@ -1,13 +1,16 @@
<#if bean.singleBinding??>
<${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
+ <@writePreText bean=bean.singleBinding />
<${nsp}:singleBinding <@writeAttribs attribs="beanId,beanClass@class" bean=bean.singleBinding /> />
</${nsp}:reader>
<#elseif bean.listBinding??>
<${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
+ <@writePreText bean=bean.listBinding />
<${nsp}:listBinding <@writeAttribs attribs="beanId,beanClass@class" bean=bean.listBinding /> />
</${nsp}:reader>
<#elseif bean.mapBinding??>
<${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
+ <@writePreText bean=bean.mapBinding />
<${nsp}:mapBinding <@writeAttribs attribs="beanId,beanClass@class,keyField" bean=bean.mapBinding /> />
</${nsp}:reader>
<#else>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl 2010-06-18 14:36:27 UTC (rev 22882)
@@ -1,13 +1,16 @@
<#if bean.singleBinding??>
<${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
+ <@writePreText bean=bean.singleBinding />
<${nsp}:singleBinding <@writeAttribs attribs="beanId,beanClass@class" bean=bean.singleBinding /> />
</${nsp}:reader>
<#elseif bean.listBinding??>
<${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
+ <@writePreText bean=bean.listBinding />
<${nsp}:listBinding <@writeAttribs attribs="beanId,beanClass@class" bean=bean.listBinding /> />
</${nsp}:reader>
<#elseif bean.mapBinding??>
<${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
+ <@writePreText bean=bean.mapBinding />
<${nsp}:mapBinding <@writeAttribs attribs="beanId,beanClass@class,keyField" bean=bean.mapBinding /> />
</${nsp}:reader>
<#else>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl 2010-06-18 14:36:27 UTC (rev 22882)
@@ -2,10 +2,12 @@
<#if (numChildElemenst > 0)>
<${nsp}:bindings <@writeAttribs attribs="beanId,beanClass@class,createOnElement,createOnElementNS"/>>
<#list bean.valueBindings as valueBinding>
+ <@writePreText bean=valueBinding />
<#assign numDecodeParams = (valueBinding.decodeParams?size) >
<#if (numDecodeParams > 0)>
<${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal@default"/>>
<#list valueBinding.decodeParams as decodeParam>
+ <@writePreText bean=decodeParam />
<${nsp}:decodeParam <@writeAttribs bean=decodeParam attribs="name"/>>${decodeParam.value}</${nsp}:decodeParam>
</#list>
</${nsp}:value>
@@ -14,9 +16,11 @@
</#if>
</#list>
<#list bean.wireBindings as wireBinding>
+ <@writePreText bean=wireBinding />
<${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement,wireOnElementNS"/> />
</#list>
<#list bean.expressionBindings as expressionBinding>
+ <@writePreText bean=expressionBinding />
<${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,execOnElementNS"/> />
</#list>
</${nsp}:bindings>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl 2010-06-18 14:36:27 UTC (rev 22882)
@@ -2,10 +2,12 @@
<#if (numChildElemenst > 0)>
<${nsp}:bean <@writeAttribs attribs="beanId,beanClass@class,createOnElement,createOnElementNS"/>>
<#list bean.valueBindings as valueBinding>
+ <@writePreText bean=valueBinding />
<#assign numDecodeParams = (valueBinding.decodeParams?size) >
<#if (numDecodeParams > 0)>
<${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal@default"/>>
<#list valueBinding.decodeParams as decodeParam>
+ <@writePreText bean=decodeParam />
<${nsp}:decodeParam <@writeAttribs bean=decodeParam attribs="name"/>>${decodeParam.value}</${nsp}:decodeParam>
</#list>
</${nsp}:value>
@@ -14,9 +16,11 @@
</#if>
</#list>
<#list bean.wireBindings as wireBinding>
+ <@writePreText bean=wireBinding />
<${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement,wireOnElementNS"/> />
</#list>
<#list bean.expressionBindings as expressionBinding>
+ <@writePreText bean=expressionBinding />
<${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,execOnElementNS,initVal"/> />
</#list>
</${nsp}:bean>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl 2010-06-18 14:36:27 UTC (rev 22882)
@@ -2,10 +2,12 @@
<#if (numChildElemenst > 0)>
<${nsp}:bean <@writeAttribs attribs="beanId,beanClass@class,createOnElement"/>>
<#list bean.valueBindings as valueBinding>
+ <@writePreText bean=valueBinding />
<#assign numDecodeParams = (valueBinding.decodeParams?size) >
<#if (numDecodeParams > 0)>
<${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,decoder,defaultVal@default"/>>
<#list valueBinding.decodeParams as decodeParam>
+ <@writePreText bean=decodeParam />
<${nsp}:decodeParam <@writeAttribs bean=decodeParam attribs="name"/>>${decodeParam.value}</${nsp}:decodeParam>
</#list>
</${nsp}:value>
@@ -14,9 +16,11 @@
</#if>
</#list>
<#list bean.wireBindings as wireBinding>
+ <@writePreText bean=wireBinding />
<${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement"/> />
</#list>
<#list bean.expressionBindings as expressionBinding>
+ <@writePreText bean=expressionBinding />
<${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,initVal"/> />
</#list>
</${nsp}:bean>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-18 14:36:27 UTC (rev 22882)
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="libs/milyn-commons-1.4-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.4-20100611.170738-20.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-core-1.4-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-csv-1.4-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.4-20100611.170738-18.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.4-20100611.170738-16.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-all-1.4-SNAPSHOT.jar" sourcepath="/Users/tfennelly/.m2/repository/org/milyn/milyn-smooks-all/1.4-SNAPSHOT/milyn-smooks-all-1.4-SNAPSHOT-sources.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jaxen-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="libs/mvel2-2.0.17.jar"/>
<classpathentry exported="true" kind="lib" path="libs/xstream-1.2.2.jar"/>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.project
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.project 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.project 2010-06-18 14:36:27 UTC (rev 22882)
@@ -1,28 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.smooks.runtime</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.smooks.runtime</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>SMOOKS_CORE_SRC</name>
+ <type>2</type>
+ <locationURI>SMOOKS_CORE_SRC</locationURI>
+ </link>
+ <link>
+ <name>SMOOKS_JAVABEAN_SRC</name>
+ <type>2</type>
+ <locationURI>SMOOKS_JAVABEAN_SRC</locationURI>
+ </link>
+ </linkedResources>
+</projectDescription>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-18 14:36:27 UTC (rev 22882)
@@ -19,38 +19,163 @@
libs/jaxen-1.1.1.jar,
libs/mvel2-2.0.17.jar,
libs/xstream-1.2.2.jar,
- libs/milyn-commons-1.4-SNAPSHOT.jar,
- libs/milyn-edisax-parser-1.4-20100611.170738-20.jar,
- libs/milyn-smooks-core-1.4-SNAPSHOT.jar,
- libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,
- libs/milyn-smooks-edi-1.4-20100611.170738-18.jar,
- libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,
- libs/milyn-smooks-json-1.4-20100611.170738-16.jar
+ libs/milyn-smooks-all-1.4-SNAPSHOT.jar
Bundle-Localization: plugin
Bundle-Vendor: %providerName
Export-Package: au.com.bytecode.opencsv,
- au.com.bytecode.opencsv.bean,
- freemarker.core,
- freemarker.template,
- freemarker.template.utility,
- org.milyn,
- org.milyn.cdr,
- org.milyn.container,
- org.milyn.csv,
- org.milyn.delivery,
- org.milyn.delivery.sax,
- org.milyn.io,
- org.milyn.javabean,
- org.milyn.javabean.context,
- org.milyn.javabean.decoders,
- org.milyn.javabean.dynamic,
- org.milyn.javabean.dynamic.ext,
- org.milyn.javabean.dynamic.resolvers,
- org.milyn.javabean.dynamic.serialize,
- org.milyn.javabean.dynamic.serialize.freemarker,
- org.milyn.javabean.dynamic.visitor,
- org.milyn.json,
- org.milyn.payload,
- org.milyn.smooks.edi,
- org.milyn.util,
- org.milyn.xml
+ au.com.bytecode.opencsv.bean;uses:="au.com.bytecode.opencsv",
+ freemarker.core;
+ uses:="javax.swing.tree,
+ javax.swing,
+ new freemarker.core,
+ freemarker.template",
+ freemarker.template;
+ uses:="freemarker.ext.beans,
+ javax.swing.tree,
+ freemarker.cache,
+ freemarker.core",
+ freemarker.template.utility;
+ uses:="org.python.core,
+ freemarker.core,
+ freemarker.template,
+ org.python.util,
+ org.w3c.dom",
+ org.milyn;
+ uses:="org.milyn.cdr,
+ org.milyn.container,
+ javax.xml.transform,
+ org.milyn.profile,
+ org.milyn.delivery",
+ org.milyn.cdr;
+ uses:="new org.milyn.cdr,
+ org.milyn.expression,
+ org.milyn.container,
+ org.milyn.profile,
+ org.w3c.dom,
+ javax.xml.namespace,
+ org.milyn,
+ org.milyn.delivery.sax,
+ org.milyn.delivery,
+ org.milyn.cdr.xpath",
+ org.milyn.container;
+ uses:="org.milyn.delivery.dom,
+ org.milyn.event,
+ org.milyn.cdr,
+ org.milyn.javabean.context,
+ org.milyn.delivery,
+ org.milyn.profile,
+ org.milyn.resource",
+ org.milyn.csv;
+ uses:="org.milyn.xml,
+ org.milyn.cdr,
+ org.milyn,
+ org.milyn.container,
+ org.milyn.delivery,
+ org.xml.sax",
+ org.milyn.delivery;
+ uses:="org.apache.commons.logging,
+ org.milyn.delivery.dom,
+ org.milyn.cdr,
+ org.milyn.container,
+ javax.xml.parsers,
+ org.milyn.dtd,
+ org.milyn.profile,
+ org.w3c.dom,
+ org.xml.sax,
+ org.milyn,
+ org.xml.sax.ext,
+ org.milyn.delivery.sax,
+ javax.xml.transform,
+ org.milyn.delivery.ordering",
+ org.milyn.delivery.sax;
+ uses:="org.milyn,
+ org.xml.sax.ext,
+ org.milyn.container,
+ javax.xml.transform,
+ org.milyn.delivery,
+ org.w3c.dom,
+ javax.xml.namespace,
+ org.xml.sax",
+ org.milyn.io;
+ uses:="org.apache.commons.logging,
+ org.milyn.delivery.dom,
+ org.milyn.delivery.sax,
+ org.milyn.container,
+ org.milyn.delivery,
+ org.milyn.delivery.ordering,
+ org.w3c.dom",
+ org.milyn.javabean;
+ uses:="org.milyn.expression,
+ org.milyn.delivery.dom,
+ org.milyn.container,
+ org.milyn.javabean.repository,
+ org.w3c.dom,
+ org.milyn,
+ org.milyn.delivery.sax,
+ org.milyn.javabean.factory,
+ org.milyn.javabean.context,
+ org.milyn.delivery,
+ org.milyn.delivery.ordering",
+ org.milyn.javabean.context;
+ uses:="org.milyn.javabean.lifecycle,
+ org.milyn.delivery.dom,
+ org.milyn.delivery.sax,
+ org.milyn.container,
+ org.milyn.delivery,
+ org.w3c.dom,
+ org.milyn.javabean.repository",
+ org.milyn.javabean.decoders;uses:="org.milyn.javabean,org.milyn.config",
+ org.milyn.javabean.dynamic;
+ uses:="org.apache.commons.logging,
+ org.milyn,
+ org.milyn.javabean.dynamic.serialize,
+ javax.xml.validation,
+ org.milyn.delivery,
+ org.xml.sax",
+ org.milyn.javabean.dynamic.ext;
+ uses:="org.milyn.delivery.dom,
+ org.milyn.container,
+ org.milyn.delivery,
+ org.w3c.dom",
+ org.milyn.javabean.dynamic.resolvers;uses:="org.xml.sax",
+ org.milyn.javabean.dynamic.serialize;uses:="org.milyn.javabean.dynamic",
+ org.milyn.javabean.dynamic.serialize.freemarker;
+ uses:="org.milyn.javabean.dynamic,
+ freemarker.core,
+ org.milyn.javabean.dynamic.serialize,
+ freemarker.template",
+ org.milyn.javabean.dynamic.visitor;
+ uses:="org.milyn.javabean.lifecycle,
+ org.milyn.delivery.dom,
+ org.milyn.container,
+ org.w3c.dom",
+ org.milyn.json;
+ uses:="org.milyn.xml,
+ org.milyn,
+ org.milyn.cdr,
+ org.milyn.container,
+ org.w3c.dom,
+ org.xml.sax",
+ org.milyn.payload;uses:="org.milyn.container,javax.xml.transform,javax.xml.transform.stream",
+ org.milyn.smooks.edi;
+ uses:="org.milyn.xml,
+ org.milyn,
+ org.milyn.cdr,
+ org.milyn.container,
+ org.milyn.edisax,
+ org.milyn.delivery,
+ org.xml.sax",
+ org.milyn.util;
+ uses:="javax.naming,
+ org.apache.commons.logging,
+ org.milyn.container,
+ org.hsqldb,
+ freemarker.template",
+ org.milyn.xml;
+ uses:="new org.milyn.xml,
+ org.milyn.container,
+ javax.xml.transform,
+ javax.xml.parsers,
+ org.milyn.delivery,
+ org.w3c.dom,
+ org.xml.sax"
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-18 14:36:27 UTC (rev 22882)
@@ -7,11 +7,5 @@
libs/jaxen-1.1.1.jar,\
libs/mvel2-2.0.17.jar,\
libs/xstream-1.2.2.jar,\
- libs/milyn-commons-1.4-SNAPSHOT.jar,\
- libs/milyn-edisax-parser-1.4-20100611.170738-20.jar,\
- libs/milyn-smooks-core-1.4-SNAPSHOT.jar,\
- libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,\
- libs/milyn-smooks-edi-1.4-20100611.170738-18.jar,\
- libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,\
- libs/milyn-smooks-json-1.4-20100611.170738-16.jar
+ libs/milyn-smooks-all-1.4-SNAPSHOT.jar
jars.compile.order =
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml 2010-06-18 14:36:27 UTC (rev 22882)
@@ -1,68 +0,0 @@
-<project name="Get-Smooks" default="smooks.dependencies.get" basedir="." xmlns:artifact="urn:maven-artifact-ant">
-
- <property name="smooks.version" value="1.4-SNAPSHOT"/>
-
- <description>
- Script for pulling Smooks v${smooks.version} jars from the maven repo.
- </description>
-
- <property environment="env"/>
- <property name="maven.ant.version" value="2.0.9"/>
- <property name="maven.dir" value="org/apache/maven/maven-ant-tasks/${maven.ant.version}"/>
- <property name="maven.jar" value="maven-ant-tasks-${maven.ant.version}.jar"/>
- <pathconvert targetos="unix" property="maven.repo.dir">
- <path>
- <pathelement location="${user.home}/.m2/repository"/>
- </path>
- </pathconvert>
- <pathconvert targetos="unix" property="maven.ant.repo.dir">
- <path>
- <pathelement location="${maven.repo.dir}/${maven.dir}"/>
- </path>
- </pathconvert>
- <condition property="maven.exists.locally">
- <available file="${maven.ant.repo.dir}/${maven.jar}"/>
- </condition>
-
- <target name="smooks.dependencies.get" depends="maven.get">
-
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpath="${maven.ant.repo.dir}/${maven.jar}"/>
- <artifact:remoteRepository id="codehaus.m2.snapshots" url="http://snapshots.repository.codehaus.org" />
- <artifact:dependencies filesetId="dependencies">
-
- <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-csv" />
- <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-edi" />
- <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-javabean"/>
- <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-json"/>
-
- <remoteRepository refid="codehaus.m2.snapshots" />
- </artifact:dependencies>
-
- <tstamp>
- <format property="get.time" pattern="MM-dd-yyyy-hh-mm-ss"/>
- </tstamp>
-
- <property name="todir" value="libs" />
- <antcall target="copy.dependencies">
- <reference refid="dependencies" />
- </antcall>
- <delete>
- <fileset dir="./${todir}" includes="commons*.jar,jta*.jar,xerces*.jar,xpp*.jar,xml-apis*.jar,junit*,log4j*,hsqldb*,servlet-api*,xalan*,jbossall-client*,jboss-j2ee*,jdom*,cglib-full*,cglib-nodep*,struts*,mockejb*,mockrunner*,commons-beanutils*,commons-digester*,commons-fileupload*,commons-validator*,oro*,xmlunit*,hibernate-core-*,ibatis-sqlmap-*,dom4j-*,ant-*,javassist-3.10.0.GA.jar" />
- </delete>
- </target>
-
- <target name="maven.get" unless="maven.exists.locally">
- <mkdir dir="${maven.ant.repo.dir}"/>
- <get src="http://repo1.maven.org/maven2/${maven.dir}/${maven.jar}" dest="${maven.ant.repo.dir}/${maven.jar}"
- usetimestamp="true"/>
- </target>
-
- <target name="copy.dependencies">
- <mkdir dir="./${todir}" />
- <copy todir="./${todir}">
- <fileset refid="dependencies"/>
- <mapper type="flatten"/>
- </copy>
- </target>
-
-</project>
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-20100611.170738-20.jar
===================================================================
(Binary files differ)
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-20100611.170738-18.jar
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-20100611.170738-16.jar
===================================================================
(Binary files differ)
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-06-18 14:36:27 UTC (rev 22882)
@@ -37,7 +37,8 @@
org.eclipse.debug.ui,
org.eclipse.jdt.debug.ui,
org.eclipse.jdt.junit,
- org.eclipse.ui.console
+ org.eclipse.ui.console,
+ org.jboss.tools.smooks.model
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-06-18 14:36:27 UTC (rev 22882)
@@ -76,6 +76,7 @@
import org.jboss.tools.smooks.configuration.validate.SmooksMarkerHelper;
import org.jboss.tools.smooks.configuration.validate.SmooksModelValidator;
import org.jboss.tools.smooks.graphical.editors.ISmooksEditorInitListener;
+import org.jboss.tools.smooks.model.SmooksModelBuilder;
import org.jboss.tools.smooks.model.common.AbstractAnyType;
import org.jboss.tools.smooks.model.common.provider.CommonItemProviderAdapterFactory;
import org.jboss.tools.smooks.model.csv12.provider.Csv12ItemProviderAdapterFactory;
@@ -134,6 +135,8 @@
protected boolean graphChanged = false;
+ private SmooksModelBuilder modelBuilder;
+
// private Object smooksDOMModel;
public AbstractSmooksFormEditor() {
@@ -141,6 +144,8 @@
resourceChangeListener = new SmooksResourceTraker();
xmlDocumentTraker = new SmooksXMLEditorDocumentListener();
initEditingDomain();
+
+ modelBuilder = new SmooksModelBuilder();
}
/**
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project 2010-06-18 14:36:27 UTC (rev 22882)
@@ -25,4 +25,16 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>SMOOKS_CORE_SRC</name>
+ <type>2</type>
+ <locationURI>SMOOKS_CORE_SRC</locationURI>
+ </link>
+ <link>
+ <name>SMOOKS_JAVABEAN_SRC</name>
+ <type>2</type>
+ <locationURI>SMOOKS_JAVABEAN_SRC</locationURI>
+ </link>
+ </linkedResources>
</projectDescription>
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF 2010-06-18 14:36:27 UTC (rev 22882)
@@ -8,8 +8,8 @@
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Require-Bundle: org.junit,
- org.jboss.tools.smooks.runtime,
org.eclipse.core.runtime,
- org.jboss.tools.smooks.model
+ org.jboss.tools.smooks.model,
+ org.jboss.tools.smooks.runtime
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-18 14:36:27 UTC (rev 22882)
@@ -63,7 +63,10 @@
public void assertModelEquals(Model<SmooksModel> model, String messageFile) throws IOException, SAXException {
StringWriter modelWriter = new StringWriter();
model.writeModel(modelWriter);
- System.out.println(modelWriter);
+
+// System.out.println(modelWriter);
+// System.out.println(org.milyn.io.StreamUtils.readStreamAsString(getClass().getResourceAsStream(messageFile)));
+
XMLUnit.setIgnoreWhitespace( true );
XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString()));
}
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-18 14:36:27 UTC (rev 22882)
@@ -71,4 +71,8 @@
params.setFilterType(StreamFilterType.SAX);
assertModelEquals(model, "v1_1/config-01.xml");
}
+
+ public void test_config_v11_03() throws IOException, SAXException {
+ test("v1_1/config-03.xml");
+ }
}
\ No newline at end of file
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml 2010-06-18 14:36:27 UTC (rev 22882)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd">
+
+ <!-- params -->
+ <params>
+ <!-- param a -->
+ <param name="a">aVal</param>
+ <param name="b">bVal</param>
+ <!-- filter param -->
+ <param name="stream.filter.type">DOM</param>
+ </params>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml 2010-06-18 14:36:27 UTC (rev 22882)
@@ -12,7 +12,9 @@
Wire in the "header" and "orderItems" beans.
-->
<jb:bindings beanId="order" class="example.model.Order" createOnElement="order">
+ <!-- Wire in the header... -->
<jb:wiring property="header" beanIdRef="header" />
+ <!-- Wire in the order items... -->
<jb:wiring property="orderItems" beanIdRef="orderItems" />
</jb:bindings>
@@ -29,13 +31,18 @@
This bean is wired into the "order" bean.
-->
<jb:bindings beanId="header" class="example.model.Header" createOnElement="header">
+ <!-- Date... -->
<jb:value property="date" decoder="Date" data="header/date" dataNS="http://boohoo">
+ <!-- Decode formatting... -->
<jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam>
<jb:decodeParam name="locale-language">en</jb:decodeParam>
<jb:decodeParam name="locale-country">IE</jb:decodeParam>
</jb:value>
+ <!-- customer num... -->
<jb:value property="customerNumber" decoder="Long" data="header/customer/@number" setterMethod="setCustomerNumber" />
+ <!-- customer name... -->
<jb:value property="customerName" data="header/customer" />
+ <!-- x by expression... -->
<jb:expression property="x" setterMethod="setX" execOnElement="xEl" execOnElementNS="http://x" />
</jb:bindings>
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml 2010-06-18 14:36:27 UTC (rev 22882)
@@ -12,7 +12,9 @@
Wire in the "header" and "orderItems" beans.
-->
<jb:bean beanId="order" class="example.model.Order" createOnElement="order">
+ <!-- comment -->
<jb:wiring property="header" beanIdRef="header" />
+ <!-- comment -->
<jb:wiring property="orderItems" beanIdRef="orderItems" />
</jb:bean>
@@ -29,13 +31,17 @@
This bean is wired into the "order" bean.
-->
<jb:bean beanId="header" class="example.model.Header" createOnElement="header">
+ <!-- comment -->
<jb:value property="date" decoder="Date" data="header/date" dataNS="http://boohoo">
+ <!-- comment -->
<jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam>
<jb:decodeParam name="locale-language">en</jb:decodeParam>
<jb:decodeParam name="locale-country">IE</jb:decodeParam>
</jb:value>
<jb:value property="customerNumber" decoder="Long" data="header/customer/@number" setterMethod="setCustomerNumber" />
+ <!-- comment -->
<jb:value property="customerName" data="header/customer" />
+ <!-- comment -->
<jb:expression property="x" setterMethod="setX" execOnElement="xEl" execOnElementNS="http://x" />
</jb:bean>
@@ -46,6 +52,7 @@
<jb:bean beanId="orderItem" class="example.model.OrderItem" createOnElement="order-item">
<jb:value property="productId" decoder="Long" data="order-item/product" />
<jb:value property="quantity" decoder="Integer" data="order-item/quantity" />
+ <!-- comment -->
<jb:value property="price" decoder="Double" data="order-item/price" />
</jb:bean>
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml 2010-06-18 14:35:31 UTC (rev 22881)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml 2010-06-18 14:36:27 UTC (rev 22882)
@@ -13,6 +13,7 @@
-->
<jb:bean beanId="order" class="example.model.Order" createOnElement="order">
<jb:wiring property="header" beanIdRef="header" />
+ <!-- comment -->
<jb:wiring property="orderItems" beanIdRef="orderItems" />
</jb:bean>
@@ -30,12 +31,17 @@
-->
<jb:bean beanId="header" class="example.model.Header" createOnElement="header">
<jb:value property="date" decoder="Date" data="header/date">
+ <!-- comment -->
<jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam>
<jb:decodeParam name="locale-language">en</jb:decodeParam>
+ <!-- comment -->
<jb:decodeParam name="locale-country">IE</jb:decodeParam>
</jb:value>
+ <!-- comment -->
<jb:value property="customerNumber" decoder="Long" data="header/customer/@number" setterMethod="setCustomerNumber" />
+ <!-- comment -->
<jb:value property="customerName" data="header/customer" />
+ <!-- comment -->
<jb:expression property="x" setterMethod="setX" execOnElement="xEl" />
</jb:bean>
@@ -45,6 +51,7 @@
-->
<jb:bean beanId="orderItem" class="example.model.OrderItem" createOnElement="order-item">
<jb:value property="productId" decoder="Long" data="order-item/product" />
+ <!-- comment -->
<jb:value property="quantity" decoder="Integer" data="order-item/quantity" />
<jb:value property="price" decoder="Double" data="order-item/price" />
</jb:bean>
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22881 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-06-18 10:35:31 -0400 (Fri, 18 Jun 2010)
New Revision: 22881
Removed:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionPulldownDelegate.java
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CompilationUnitCollector.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizardDataFactory.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6468 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java 2010-06-18 14:22:54 UTC (rev 22880)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java 2010-06-18 14:35:31 UTC (rev 22881)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.hibernate.eclipse.jdt.ui.internal.jpa.actions;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -17,6 +19,10 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.expressions.EvaluationContext;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
@@ -39,14 +45,15 @@
public class JPAMapToolActionDelegate extends AbstractHandler implements IObjectActionDelegate,
IEditorActionDelegate, IViewActionDelegate {
- public JPAMapToolActor actor = JPAMapToolActor.getInstance();
+ protected JPAMapToolActor actor = new JPAMapToolActor();
+ protected WeakReference<Object> refContextObject = null;
+
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
}
public void run(IAction action) {
- actor.updateSelected(Integer.MAX_VALUE);
- //actor.updateOpen();
+ runInternal();
}
public void selectionChanged(IAction action, ISelection selection) {
@@ -63,11 +70,17 @@
}
public Object execute(ExecutionEvent event) throws ExecutionException {
- actor.updateSelected(Integer.MAX_VALUE);
- //actor.updateOpen();
+ runInternal();
return null;
}
+ public void runInternal() {
+ if (refContextObject != null) {
+ processContextObjectElements();
+ }
+ actor.updateSelected(Integer.MAX_VALUE);
+ }
+
public void init(IViewPart view) {
}
public boolean isCUSelected() {
@@ -86,28 +99,77 @@
return false;
}
- @SuppressWarnings("unchecked")
public void setEnabled(Object evaluationContext) {
- boolean enable = false;
- actor.setSelection(null);
- actor.clearSelectionCU();
- if (!enable && evaluationContext instanceof EvaluationContext) {
+ if (evaluationContext instanceof EvaluationContext) {
EvaluationContext ec = (EvaluationContext)evaluationContext;
Object obj = ec.getDefaultVariable();
- if (obj instanceof List) {
- Iterator it = ((List)obj).iterator();
- while (it.hasNext()) {
- obj = it.next();
- actor.processJavaElements(obj);
+ refContextObject = new WeakReference<Object>(obj);
+ } else {
+ refContextObject = null;
+ }
+ setBaseEnabled(checkEnabled());
+ }
+
+ protected boolean checkEnabled() {
+ boolean enable = false;
+ Object obj = refContextObject != null ? refContextObject.get() : null;
+ if (obj == null) {
+ return enable;
+ }
+ List<?> list = null;
+ if (obj instanceof List) {
+ list = (List<?>)obj;
+ } else {
+ list = Collections.singletonList(obj);
+ }
+ Iterator<?> it = list.iterator();
+ while (it.hasNext() && !enable) {
+ Object obj2 = it.next();
+ if (!(obj2 instanceof IJavaElement)) {
+ continue;
+ }
+ int kind = IPackageFragmentRoot.K_SOURCE;
+ if (obj2 instanceof IPackageFragment) {
+ IPackageFragment pf = (IPackageFragment)obj2;
+ try {
+ kind = pf.getKind();
+ } catch (JavaModelException e) {
+ kind = IPackageFragmentRoot.K_BINARY;
}
- } else {
- actor.processJavaElements(obj);
+ } else if (obj2 instanceof IPackageFragmentRoot) {
+ IPackageFragmentRoot pfr = (IPackageFragmentRoot)obj2;
+ try {
+ kind = pfr.getKind();
+ } catch (JavaModelException e) {
+ kind = IPackageFragmentRoot.K_BINARY;
+ }
}
- enable = actor.getSelectionCUSize() > 0;
+ if (kind == IPackageFragmentRoot.K_SOURCE) {
+ enable = true;
+ }
}
if (!enable) {
enable = isCUSelected();
}
- setBaseEnabled(enable);
+ return enable;
}
+
+ public void processContextObjectElements() {
+ actor.setSelection(null);
+ actor.clearSelectionCU();
+ Object obj = refContextObject != null ? refContextObject.get() : null;
+ if (obj == null) {
+ return;
+ }
+ if (obj instanceof List) {
+ @SuppressWarnings("rawtypes")
+ Iterator it = ((List)obj).iterator();
+ while (it.hasNext()) {
+ obj = it.next();
+ actor.processJavaElements(obj);
+ }
+ } else {
+ actor.processJavaElements(obj);
+ }
+ }
}
Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionPulldownDelegate.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionPulldownDelegate.java 2010-06-18 14:22:54 UTC (rev 22880)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionPulldownDelegate.java 2010-06-18 14:35:31 UTC (rev 22881)
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.hibernate.eclipse.jdt.ui.internal.jpa.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
-import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages;
-
-/**
- * Context menu action delegate for "Generate Hibernate/JPA annotations..."
- *
- * @author Vitali
- */
-public class JPAMapToolActionPulldownDelegate implements
- IWorkbenchWindowPulldownDelegate2, IEditorActionDelegate, IActionDelegate2, IMenuCreator {
-
- /**
- * The menu created by this action
- */
- private Menu fMenu;
- protected boolean fRecreateMenu = false;
-
- public JPAMapToolActor actor = JPAMapToolActor.getInstance();
-
- public Menu getMenu(Menu parent) {
- setMenu(new Menu(parent));
- fillMenu(fMenu);
- initMenu();
- return fMenu;
- }
-
- public Menu getMenu(Control parent) {
- setMenu(new Menu(parent));
- fillMenu(fMenu);
- initMenu();
- return fMenu;
- }
-
- public void dispose() {
- setMenu(null);
- }
-
- public void init(IWorkbenchWindow window) {
- }
-
- public void run(IAction action) {
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- actor.setSelection(selection);
- if (action != null) {
- action.setEnabled(actor.getSelectedSourceSize() > 0);
- }
- }
-
- protected void addToMenu(Menu menu, IAction action, int accelerator) {
- StringBuffer label = new StringBuffer();
- if (accelerator >= 0 && accelerator < 10) {
- // add the numerical accelerator
- label.append('&');
- label.append(accelerator);
- label.append(' ');
- }
- label.append(action.getText());
- action.setText(label.toString());
- ActionContributionItem item = new ActionContributionItem(action);
- item.fill(menu, -1);
- }
-
- protected void fillMenu(Menu menu) {
- IAction action = new Action(JdtUiMessages.JPAMapToolActionPulldownDelegate_menu) {
- public void run() {
- //actor.updateOpen();
- actor.updateSelected(Integer.MAX_VALUE);
- }
- };
- addToMenu(menu, action, -1);
- }
-
- private void initMenu() {
- // Add listener to re-populate the menu each time
- // it is shown because of dynamic list
- fMenu.addMenuListener(new MenuAdapter() {
- public void menuShown(MenuEvent e) {
- Menu m = (Menu) e.widget;
- if (fRecreateMenu) {
- MenuItem[] items = m.getItems();
- for (int i = 0; i < items.length; i++) {
- items[i].dispose();
- }
- fillMenu(m);
- fRecreateMenu = false;
- }
- m.setEnabled(actor.getSelectedSourceSize() > 0);
- MenuItem[] items = m.getItems();
- for (int i = 0; i < items.length; i++) {
- items[i].setEnabled(actor.getSelectedSourceSize() > 0);
- }
- }
- public void menuHidden(MenuEvent e) {
- fRecreateMenu = true;
- }
- });
- }
-
- private void setMenu(Menu menu) {
- if (fMenu != null) {
- fMenu.dispose();
- }
- fMenu = menu;
- }
-
- public void setActiveEditor(IAction action, IEditorPart targetEditor) {
- if (action != null) {
- action.setEnabled(actor.getSelectedSourceSize() > 0);
- }
- }
-
- public void init(IAction action) {
- if (action instanceof Action) {
- ((Action)action).setMenuCreator(this);
- }
- }
-
- public void runWithEvent(IAction action, Event event) {
- //actor.updateOpen();
- actor.updateSelected(Integer.MAX_VALUE);
- }
-
-}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2010-06-18 14:22:54 UTC (rev 22880)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2010-06-18 14:35:31 UTC (rev 22881)
@@ -52,7 +52,6 @@
/**
* Actor to execute annotation generation.
- * It is singleton.
*
* @author Vitali Yemialyanchyk
*/
@@ -60,10 +59,6 @@
public class JPAMapToolActor {
/**
- * instance
- */
- private static JPAMapToolActor actor = null;
- /**
* selection - start point to generate annotations
* could be java file, list of files, package, project, some other?
*/
@@ -82,7 +77,7 @@
*/
protected AllEntitiesProcessor processor = new AllEntitiesProcessor();
- protected JPAMapToolActor() {
+ public JPAMapToolActor() {
initPreferences();
}
@@ -90,13 +85,6 @@
processor.initPreferences();
}
- public static JPAMapToolActor getInstance() {
- if (actor == null) {
- actor = new JPAMapToolActor();
- }
- return actor;
- }
-
/**
* Cleanup collection of selected elements for processing
*/
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CompilationUnitCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CompilationUnitCollector.java 2010-06-18 14:22:54 UTC (rev 22880)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CompilationUnitCollector.java 2010-06-18 14:35:31 UTC (rev 22881)
@@ -104,6 +104,7 @@
/**
* Process object - java element to collect all it's children CompilationUnits
* @param obj
+ * @param bCollect
*/
public void processJavaElements(Object obj, boolean bCollect) {
if (obj instanceof ICompilationUnit) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizardDataFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizardDataFactory.java 2010-06-18 14:22:54 UTC (rev 22880)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizardDataFactory.java 2010-06-18 14:35:31 UTC (rev 22881)
@@ -49,12 +49,12 @@
return data;
}
- @SuppressWarnings("unchecked")
static public IHibernateJPAWizardData createHibernateJPAWizardData(
final IStructuredSelection selection2Update,
IHibernateJPAWizardParams params, int depth) {
CompilationUnitCollector compileUnitCollector = new CompilationUnitCollector();
+ @SuppressWarnings("rawtypes")
Iterator itSelection2Update = selection2Update.iterator();
while (itSelection2Update.hasNext()) {
Object obj = itSelection2Update.next();
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java 2010-06-18 14:22:54 UTC (rev 22880)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java 2010-06-18 14:35:31 UTC (rev 22881)
@@ -71,7 +71,7 @@
public void testJPAMapToolActor() {
- final JPAMapToolActor jpaMapToolActor = JPAMapToolActor.getInstance();
+ final JPAMapToolActor jpaMapToolActor = new JPAMapToolActor();
final AllEntitiesProcessor allEntitiesProcessor = context.mock(AllEntitiesProcessor.class);
final AllEntitiesInfoCollector allEntitiesInfoCollector = context.mock(AllEntitiesInfoCollector.class);
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22880 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-06-18 10:22:54 -0400 (Fri, 18 Jun 2010)
New Revision: 22880
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
Log:
https://jira.jboss.org/browse/JBIDE-6373
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 2010-06-18 13:10:01 UTC (rev 22879)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-06-18 14:22:54 UTC (rev 22880)
@@ -646,8 +646,12 @@
}
public void completed(ProgressEvent event) {
+ try{
MozillaEditor.this.onLoadWindow();
xulRunnerEditor.getBrowser().removeProgressListener(this);
+ } catch(Exception ex){
+ VpePlugin.getPluginLog().logError(ex);
+ }
}
});
15 years, 10 months
- 1
- 0