From ebc46b310bf1f44c4acbeae3d2ab8c1aeaef5eb5 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Fri, 12 Dec 2014 14:16:39 +0000 Subject: [PATCH] Refactoring: move all code needing the workbench from eclipse.ui to eclipse.ui.workbench bundle, in order to be able to use the base ui bundle to factorise common patterns. git-svn-id: https://svn.argeo.org/commons/trunk@7569 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.cms/bnd.bnd | 204 +----------------- org.argeo.eclipse.ui.rap/bnd.bnd | 2 - org.argeo.eclipse.ui.workbench/bnd.bnd | 2 +- .../spring/ApplicationContextTracker.java | 0 .../eclipse/spring/SpringCommandHandler.java | 0 .../spring/SpringExtensionFactory.java | 0 .../eclipse/ui/workbench}/CommandUtils.java | 5 +- .../eclipse/ui/workbench}/ErrorFeedback.java | 2 +- .../ui/workbench/commands/AddFolderNode.java | 2 +- .../ui/workbench/commands/AddPrivileges.java | 2 +- .../commands/AddRemoteRepository.java | 4 +- .../workbench/commands/CreateWorkspace.java | 2 +- .../ui/workbench/commands/DeleteNodes.java | 2 +- .../ui/workbench/commands/DumpNode.java | 2 +- .../ui/workbench/commands/EditNode.java | 4 +- .../ui/workbench/commands/GetNodeSize.java | 2 +- .../workbench/commands/ImportFileSystem.java | 2 +- .../ui/workbench/commands/OpenEditor.java | 4 +- .../workbench/jcr/GenericJcrQueryEditor.java | 2 +- .../ui/workbench}/jcr/JcrPreferenceStore.java | 2 +- .../jcr/internal/model/RepositoriesElem.java | 2 +- .../parts}/AbstractJcrQueryEditor.java | 2 +- .../parts/ImportFileSystemWizard.java | 2 +- .../internal/parts}/JcrQueryEditorInput.java | 2 +- .../jcr/internal/parts}/NodeEditorInput.java | 2 +- org.argeo.eclipse.ui/bnd.bnd | 26 ++- .../org/argeo/eclipse/ui/ArgeoUiPlugin.java | 78 ------- .../src/org/argeo/eclipse/ui/Error.java | 33 --- .../security/ui/admin/views/UsersView.java | 2 +- .../ui/admin/wizards/NewUserWizard.java | 2 +- .../security/ui/rap/SecureEntryPoint.java | 2 +- org.argeo.security.ui/bnd.bnd | 3 +- org.argeo.security.ui/pom.xml | 2 +- .../ui/commands/OpenHomePerspective.java | 2 +- .../ui/dialogs/ChangePasswordDialog.java | 2 +- 35 files changed, 54 insertions(+), 353 deletions(-) rename {org.argeo.eclipse.ui => org.argeo.eclipse.ui.workbench}/src/org/argeo/eclipse/spring/ApplicationContextTracker.java (100%) rename {org.argeo.eclipse.ui => org.argeo.eclipse.ui.workbench}/src/org/argeo/eclipse/spring/SpringCommandHandler.java (100%) rename {org.argeo.eclipse.ui => org.argeo.eclipse.ui.workbench}/src/org/argeo/eclipse/spring/SpringExtensionFactory.java (100%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils => org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench}/CommandUtils.java (97%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench}/ErrorFeedback.java (98%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench}/jcr/JcrPreferenceStore.java (99%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors => org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts}/AbstractJcrQueryEditor.java (99%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors => org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts}/JcrQueryEditorInput.java (96%) rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors => org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts}/NodeEditorInput.java (96%) delete mode 100644 org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ArgeoUiPlugin.java delete mode 100644 org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/Error.java diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd index 6af318a2d..969fc94ac 100644 --- a/org.argeo.cms/bnd.bnd +++ b/org.argeo.cms/bnd.bnd @@ -1,197 +1,7 @@ -# BND instructions -#----------------------------------------------------------------------- -#Tue Nov 25 13:15:11 CET 2014 -pom.id=org.argeo.commons\:org.argeo.cms\:jar\:2.1.12-SNAPSHOT -env.DESKTOP_SESSION=gnome -env.OLDPWD=/home/mbaudier/dev/src/commons -file.encoding.pkg=sun.io -java.home=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre -env.GDM_LANG=en_GB.utf8 -env.DISPLAY=\:0.0 -env.LS_COLORS=rs\=0\:di\=01;34\:ln\=01;36\:mh\=00\:pi\=40;33\:so\=01;35\:do\=01;35\:bd\=40;33;01\:cd\=40;33;01\:or\=40;31;01\:mi\=01;05;37;41\:su\=37;41\:sg\=30;43\:ca\=30;41\:tw\=30;42\:ow\=34;42\:st\=37;44\:ex\=01;32\:*.tar\=01;31\:*.tgz\=01;31\:*.arj\=01;31\:*.taz\=01;31\:*.lzh\=01;31\:*.lzma\=01;31\:*.tlz\=01;31\:*.txz\=01;31\:*.zip\=01;31\:*.z\=01;31\:*.Z\=01;31\:*.dz\=01;31\:*.gz\=01;31\:*.lz\=01;31\:*.xz\=01;31\:*.bz2\=01;31\:*.tbz\=01;31\:*.tbz2\=01;31\:*.bz\=01;31\:*.tz\=01;31\:*.deb\=01;31\:*.rpm\=01;31\:*.jar\=01;31\:*.rar\=01;31\:*.ace\=01;31\:*.zoo\=01;31\:*.cpio\=01;31\:*.7z\=01;31\:*.rz\=01;31\:*.jpg\=01;35\:*.jpeg\=01;35\:*.gif\=01;35\:*.bmp\=01;35\:*.pbm\=01;35\:*.pgm\=01;35\:*.ppm\=01;35\:*.tga\=01;35\:*.xbm\=01;35\:*.xpm\=01;35\:*.tif\=01;35\:*.tiff\=01;35\:*.png\=01;35\:*.svg\=01;35\:*.svgz\=01;35\:*.mng\=01;35\:*.pcx\=01;35\:*.mov\=01;35\:*.mpg\=01;35\:*.mpeg\=01;35\:*.m2v\=01;35\:*.mkv\=01;35\:*.ogm\=01;35\:*.mp4\=01;35\:*.m4v\=01;35\:*.mp4v\=01;35\:*.vob\=01;35\:*.qt\=01;35\:*.nuv\=01;35\:*.wmv\=01;35\:*.asf\=01;35\:*.rm\=01;35\:*.rmvb\=01;35\:*.flc\=01;35\:*.avi\=01;35\:*.fli\=01;35\:*.flv\=01;35\:*.gl\=01;35\:*.dl\=01;35\:*.xcf\=01;35\:*.xwd\=01;35\:*.yuv\=01;35\:*.cgm\=01;35\:*.emf\=01;35\:*.axv\=01;35\:*.anx\=01;35\:*.ogv\=01;35\:*.ogx\=01;35\:*.aac\=01;36\:*.au\=01;36\:*.flac\=01;36\:*.mid\=01;36\:*.midi\=01;36\:*.mka\=01;36\:*.mp3\=01;36\:*.mpc\=01;36\:*.ogg\=01;36\:*.ra\=01;36\:*.wav\=01;36\:*.axa\=01;36\:*.oga\=01;36\:*.spx\=01;36\:*.xspf\=01;36\: -pom.contributors= -project.build.developers= -classworlds.conf=/opt/apache-maven/bin/m2.conf -env.XDG_SESSION_COOKIE=9bf883dac7be1df0f982e1dd0000003a-1416578122.683229-877522490 -pom.pomFile=/home/mbaudier/dev/src/commons/org.argeo.cms/pom.xml -java.endorsed.dirs=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/endorsed -project.build.groupId=org.argeo.commons -env.LOGNAME=mbaudier -env.USERNAME=mbaudier -project.build.scm=org.apache.maven.model.Scm@2d98cc8d -env.SESSION_MANAGER=local/unix\:@/tmp/.ICE-unix/17546,unix/unix\:/tmp/.ICE-unix/17546 -env.KDEDIRS=/usr -sun.os.patch.level=unknown -java.vendor.url=http\://java.oracle.com/ -pom.profiles= -env.G_BROKEN_FILENAMES=1 -maven-symbolicname=org.argeo.commons.org.argeo.cms -java.version=1.7.0_71 -env.ORBIT_SOCKETDIR=/tmp/orbit-mbaudier -project.build.contributors= -version.argeo-commons=2.1.12-SNAPSHOT -java.vendor.url.bug=http\://bugreport.sun.com/bugreport/ -user.name=mbaudier -env.LANG=en_GB.utf8 -env.CVS_RSH=ssh -project.build.pomFile=/home/mbaudier/dev/src/commons/org.argeo.cms/pom.xml -sun.io.unicode.encoding=UnicodeLittle -sun.jnu.encoding=UTF-8 -env.DBUS_SESSION_BUS_ADDRESS=unix\:abstract\=/tmp/dbus-OazDk3vN1t,guid\=230af52c9acfa834ca05b3b0000059f6 -java.runtime.name=OpenJDK Runtime Environment -project.build.outputdirectory=/home/mbaudier/dev/src/commons/org.argeo.cms/target/classes -env.SSH_ASKPASS=/usr/libexec/openssh/gnome-ssh-askpass -rpm.release=6 -project.version=2.1.12-SNAPSHOT -java.specification.name=Java Platform API Specification -user.timezone= -env.LESSOPEN=||/usr/bin/lesspipe.sh %s -pom.mailingLists= -path.separator=\: -project.contributors= -project.inceptionYear=2007 -pom.artifactId=org.argeo.cms -env.MAVEN_CMD_LINE_ARGS=-o clean install -project.name=Argeo Content Management System -env.XMODIFIERS=@im\=none -file.encoding=UTF-8 -env.HOME=/home/mbaudier -sun.java.command=org.codehaus.plexus.classworlds.launcher.Launcher -o clean install -env.GTK_RC_FILES=/etc/gtk/gtkrc\:/home/mbaudier/.gtkrc-1.2-gnome2 -project.id=org.argeo.commons\:org.argeo.cms\:jar\:2.1.12-SNAPSHOT -env.HOSTNAME=mostar -Export-Package=org.argeo.cms;org.argeo.cms.text;org.argeo.cms.viewers;org.argeo.cms.widgets;-split-package\:\=merge-first -Bundle-License=http\://www.apache.org/licenses/LICENSE-2.0.txt -java.io.tmpdir=/tmp -project.build.mailingLists= -env.GNOME_KEYRING_PID=17536 -user.language=en -Include-Resource=org/argeo/cms/cms.cnd\=src/org/argeo/cms/cms.cnd,org/argeo/cms/CmsMsg_fr.properties\=src/org/argeo/cms/CmsMsg_fr.properties,META-INF/spring/osgi.xml\=META-INF/spring/osgi.xml,META-INF/spring/backend.xml\=META-INF/spring/backend.xml,icons/noPic-goldenRatio-640px.png\=icons/noPic-goldenRatio-640px.png,icons/noPic-square-640px.png\=icons/noPic-square-640px.png,icons/loading.gif\=icons/loading.gif -env.HISTCONTROL=ignoredups -line.separator=\n -project.build.directory=/home/mbaudier/dev/src/commons/org.argeo.cms/target -env.HISTSIZE=1000 -java.vm.info=mixed mode -developmentCycle.argeo-commons.startDate=2012-12-19 -sun.desktop=gnome -java.vm.specification.name=Java Virtual Machine Specification -project.modelEncoding=UTF-8 -env.COLORTERM=gnome-terminal -project.build.id=org.argeo.commons\:org.argeo.cms\:jar\:2.1.12-SNAPSHOT -project.build.licenses=org.apache.maven.model.License@a9d545e -version.rap.addons=0.5.0.argeo.20141029 -pom.modelVersion=4.0.0 -project.licenses=org.apache.maven.model.License@a9d545e -env.GDMSESSION=gnome -project.developers= -java.awt.printerjob=sun.print.PSPrinterJob --removeheaders=Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By -pom.version=2.1.12-SNAPSHOT -env.WINDOWID=73400323 -pom.scm=org.apache.maven.model.Scm@2d98cc8d --plugin=org.apache.felix.bundleplugin.BlueprintPlugin,aQute.lib.spring.SpringXMLType -project.mailingLists= -pom.packaging=jar -project.build.parent=org.argeo.commons\:argeo-commons\:pom\:2.1.12-SNAPSHOT -project.projectDirectory=/home/mbaudier/dev/src/commons/org.argeo.cms -os.name=Linux -project.build.modelVersion=4.0.0 -java.specification.vendor=Oracle Corporation -env.TERM=xterm -java.vm.name=OpenJDK 64-Bit Server VM -env.QT_IM_MODULE=xim -java.library.path=/usr/java/packages/lib/amd64\:/usr/lib64\:/lib64\:/lib\:/usr/lib -project.build.build=org.apache.maven.model.Build@5f0decc3 -env.PATH=/usr/lib64/qt-3.3/bin\:/usr/local/bin\:/usr/bin\:/bin\:/usr/local/sbin\:/usr/sbin\:/sbin\:/home/mbaudier/bin -pom.build=org.apache.maven.model.Build@5f0decc3 -java.class.version=51.0 -env.SHLVL=2 -project.build.version=2.1.12-SNAPSHOT -env.GNOME_KEYRING_SOCKET=/tmp/keyring-YLbPHE/socket -pom.parent=org.argeo.commons\:argeo-commons\:pom\:2.1.12-SNAPSHOT -pom.projectDirectory=/home/mbaudier/dev/src/commons/org.argeo.cms -project.modelVersion=4.0.0 -rpm.stagingRepository=/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64 -Bundle-SymbolicName=org.argeo.cms -sun.boot.library.path=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/amd64 -project.build.sourceEncoding=UTF-8 -Private-Package=org.argeo.cam.internal.* -project.build.artifactId=org.argeo.cms -sun.management.compiler=HotSpot 64-Bit Tiered Compilers -java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment -pom.name=Argeo Content Management System -env.USER=mbaudier -pom.developers= -project.build=org.apache.maven.model.Build@5f0decc3 -project.scm=org.apache.maven.model.Scm@2d98cc8d -project.baseDir=/home/mbaudier/dev/src/commons/org.argeo.cms -project.build.name=Argeo Content Management System -java.vm.specification.version=1.7 -env.KDE_IS_PRELINKED=1 -project.build.inceptionYear=2007 -env.GDM_KEYBOARD_LAYOUT=de -project.groupId=org.argeo.commons -Bundle-Version=2.1.12-SNAPSHOT-r${tstamp} -env.NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat -awt.toolkit=sun.awt.X11.XToolkit -project.build.profiles= -sun.cpu.isalist= -developmentCycle.argeo-commons=2.1 -project.profiles= -java.ext.dirs=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/ext\:/usr/java/packages/lib/ext -Import-Package=org.springframework.core,org.eclipse.core.commands,org.eclipse.swt,javax.jcr.security,* -os.version=2.6.32-504.1.3.el6.x86_64 -user.home=/home/mbaudier -java.vm.vendor=Oracle Corporation -env.JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64 -SLC-Category=org.argeo.commons -env.XAUTHORITY=/var/run/gdm/auth-for-mbaudier-7t5RHJ/database -user.dir=/home/mbaudier/dev/src/commons -env.XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt -env.WINDOWPATH=1 -env.MAIL=/var/spool/mail/mbaudier -project.build.modelEncoding=UTF-8 -env.PWD=/home/mbaudier/dev/src/commons -project.parent=org.argeo.commons\:argeo-commons\:pom\:2.1.12-SNAPSHOT -sun.cpu.endian=little -env.QTLIB=/usr/lib64/qt-3.3/lib -pom.licenses=org.apache.maven.model.License@a9d545e -project.dir=/home/mbaudier/dev/src/commons/org.argeo.cms -classifier= -version.argeo-distribution=1.4.0 -java.vm.version=24.65-b04 -java.class.path=/opt/apache-maven/boot/plexus-classworlds-2.5.1.jar -env.QTDIR=/usr/lib64/qt-3.3 -os.arch=amd64 -maven.build.version=Apache Maven 3.2.3 (33f8c3e1027c3ddde99d3cdebad2656a31e8fdf4; 2014-08-11T22\:58\:10+02\:00) -project.build.projectDirectory=/home/mbaudier/dev/src/commons/org.argeo.cms -version.rap=2.2.0-R-20131204-0942 -sun.java.launcher=SUN_STANDARD -pom.inceptionYear=2007 -env.IMSETTINGS_INTEGRATE_DESKTOP=yes -project.packaging=jar -java.vm.specification.vendor=Oracle Corporation -file.separator=/ -java.runtime.version=1.7.0_71-mockbuild_2014_10_17_22_23-b00 -project.pomFile=/home/mbaudier/dev/src/commons/org.argeo.cms/pom.xml -env.SSH_AUTH_SOCK=/tmp/keyring-YLbPHE/socket.ssh -sun.boot.class.path=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/resources.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/rt.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/sunrsasign.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/jsse.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/jce.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/charsets.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/rhino.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/jfr.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/classes -project.build.packaging=jar -maven.version=3.2.3 -project.artifactId=org.argeo.cms -env.QTINC=/usr/lib64/qt-3.3/include -user.country=GB -pom.modelEncoding=UTF-8 -maven.home=/opt/apache-maven -env.SHELL=/bin/bash -Bundle-RequiredExecutionEnvironment=JavaSE-1.6 --sourcepath=/home/mbaudier/dev/src/commons/org.argeo.cms/src,/home/mbaudier/dev/src/commons/org.argeo.cms/target/classes -pom.groupId=org.argeo.commons -java.vendor=Oracle Corporation -env.GPG_AGENT_INFO=/tmp/seahorse-CQZHIM/S.gpg-agent\:17621\:1; -env.IMSETTINGS_MODULE=none -Bundle-Name=Argeo Content Management System -java.specification.version=1.7 -env.GNOME_DESKTOP_SESSION_ID=this-is-deprecated -sun.arch.data.model=64 -#----------------------------------------------------------------------- +Import-Package: org.springframework.core,\ + org.eclipse.core.commands,\ + org.eclipse.swt,\ + javax.jcr.security,\ + * +# Useless +#Private-Package: org.argeo.cms.internal.* \ No newline at end of file diff --git a/org.argeo.eclipse.ui.rap/bnd.bnd b/org.argeo.eclipse.ui.rap/bnd.bnd index 3e0cb3cab..83a2036d4 100644 --- a/org.argeo.eclipse.ui.rap/bnd.bnd +++ b/org.argeo.eclipse.ui.rap/bnd.bnd @@ -1,5 +1,3 @@ -Bundle-ActivationPolicy: lazy -Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin Require-Bundle: org.eclipse.rap.ui,org.eclipse.core.runtime Import-Package: org.apache.commons.io,\ org.argeo,\ diff --git a/org.argeo.eclipse.ui.workbench/bnd.bnd b/org.argeo.eclipse.ui.workbench/bnd.bnd index cc75c057e..d6c44eeb9 100644 --- a/org.argeo.eclipse.ui.workbench/bnd.bnd +++ b/org.argeo.eclipse.ui.workbench/bnd.bnd @@ -8,10 +8,10 @@ Require-Bundle: org.eclipse.ui;resolution:=optional,\ org.eclipse.rap.ui.workbench;resolution:=optional Import-Package: org.argeo.eclipse.ui.specific,\ - org.argeo.eclipse.spring,\ org.eclipse.swt.widgets;version="[0,1)",\ org.osgi.framework;version="[1.5,2)",\ org.osgi.service.packageadmin,\ + org.osgi.util.tracker;version="[1.4,2)",\ org.springframework.beans.factory,\ org.springframework.core.io.support,\ * diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/spring/ApplicationContextTracker.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/spring/ApplicationContextTracker.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/spring/SpringCommandHandler.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/spring/SpringCommandHandler.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/spring/SpringExtensionFactory.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/SpringExtensionFactory.java similarity index 100% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/spring/SpringExtensionFactory.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/SpringExtensionFactory.java diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/CommandUtils.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java similarity index 97% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/CommandUtils.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java index 0979bace0..3670efbe5 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/utils/CommandUtils.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.utils; +package org.argeo.eclipse.ui.workbench; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.ArgeoUiPlugin; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.Parameterization; import org.eclipse.core.commands.ParameterizedCommand; @@ -144,7 +143,7 @@ public class CommandUtils { public static void callCommand(String commandID, Map paramMap) { try { - IWorkbench iw = ArgeoUiPlugin.getDefault().getWorkbench(); + IWorkbench iw = WorkbenchUiPlugin.getDefault().getWorkbench(); IHandlerService handlerService = (IHandlerService) iw .getService(IHandlerService.class); ICommandService cmdService = (ICommandService) iw diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ErrorFeedback.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java similarity index 98% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ErrorFeedback.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java index 895e8b866..692d8a4b9 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ErrorFeedback.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui; +package org.argeo.eclipse.ui.workbench; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java index 3ac711665..291df2ccc 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java @@ -19,9 +19,9 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeType; -import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.dialogs.SingleValue; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java index 6f5f6ccad..7100d8f18 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java @@ -19,8 +19,8 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.TreeParent; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java index 8c4536a5a..50e286179 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java @@ -25,8 +25,8 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.ErrorFeedback; -import org.argeo.eclipse.ui.utils.CommandUtils; +import org.argeo.eclipse.ui.workbench.CommandUtils; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchConstants; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.ArgeoNames; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java index 024601de5..82db51321 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java @@ -17,8 +17,8 @@ package org.argeo.eclipse.ui.workbench.commands; import java.util.Arrays; -import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.dialogs.SingleValue; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; import org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoryElem; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java index e3518e53c..ff05c631f 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java @@ -21,8 +21,8 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.TreeParent; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java index e919eb26b..79d807625 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java @@ -30,7 +30,7 @@ import javax.jcr.RepositoryException; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.specific.OpenFile; -import org.argeo.eclipse.ui.utils.CommandUtils; +import org.argeo.eclipse.ui.workbench.CommandUtils; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.argeo.jcr.JcrUtils; import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java index c02187751..4c9553484 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java @@ -21,8 +21,8 @@ import java.util.Map; import javax.jcr.Property; import javax.jcr.nodetype.NodeType; -import org.argeo.eclipse.ui.ErrorFeedback; -import org.argeo.eclipse.ui.jcr.editors.NodeEditorInput; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; +import org.argeo.eclipse.ui.workbench.jcr.internal.parts.NodeEditorInput; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java index c31f4d6b3..1caf11482 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java @@ -21,7 +21,7 @@ import java.util.List; import javax.jcr.Node; -import org.argeo.eclipse.ui.ErrorFeedback; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.argeo.jcr.JcrUtils; import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java index 0531c3a18..fa2da1dc5 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java @@ -17,8 +17,8 @@ package org.argeo.eclipse.ui.workbench.commands; import javax.jcr.Node; -import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.TreeParent; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java index f6e57c368..123f089b8 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java @@ -16,11 +16,11 @@ package org.argeo.eclipse.ui.workbench.commands; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.jcr.editors.JcrQueryEditorInput; -import org.argeo.eclipse.ui.jcr.editors.NodeEditorInput; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.argeo.eclipse.ui.workbench.jcr.GenericJcrQueryEditor; import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor; +import org.argeo.eclipse.ui.workbench.jcr.internal.parts.JcrQueryEditorInput; +import org.argeo.eclipse.ui.workbench.jcr.internal.parts.NodeEditorInput; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java index dcb14ead5..73b8be61b 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java @@ -15,8 +15,8 @@ */ package org.argeo.eclipse.ui.workbench.jcr; -import org.argeo.eclipse.ui.jcr.editors.AbstractJcrQueryEditor; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.jcr.internal.parts.AbstractJcrQueryEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java index ef14d175e..b317e12bc 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.jcr; +package org.argeo.eclipse.ui.workbench.jcr; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoriesElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoriesElem.java index 0f5ca6e3e..c0fc0c5e4 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoriesElem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoriesElem.java @@ -25,8 +25,8 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.TreeParent; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.MaintainedRepository; import org.argeo.jcr.RepositoryRegister; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AbstractJcrQueryEditor.java similarity index 99% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AbstractJcrQueryEditor.java index 5e7d69644..d16ff06bb 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AbstractJcrQueryEditor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.jcr.editors; +package org.argeo.eclipse.ui.workbench.jcr.internal.parts; import java.util.ArrayList; import java.util.List; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ImportFileSystemWizard.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ImportFileSystemWizard.java index cded3a49d..ea3bf56c7 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ImportFileSystemWizard.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ImportFileSystemWizard.java @@ -28,9 +28,9 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.specific.ImportToServerWizardPage; import org.argeo.eclipse.ui.specific.UploadFileWizardPage; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/JcrQueryEditorInput.java similarity index 96% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/JcrQueryEditorInput.java index eedccc85b..baa7e62c9 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/JcrQueryEditorInput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.jcr.editors; +package org.argeo.eclipse.ui.workbench.jcr.internal.parts; import javax.jcr.query.Query; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeEditorInput.java similarity index 96% rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeEditorInput.java index a55884f2e..bdd4afa7a 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeEditorInput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.jcr.editors; +package org.argeo.eclipse.ui.workbench.jcr.internal.parts; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; diff --git a/org.argeo.eclipse.ui/bnd.bnd b/org.argeo.eclipse.ui/bnd.bnd index ca6aaf028..1c68f758d 100644 --- a/org.argeo.eclipse.ui/bnd.bnd +++ b/org.argeo.eclipse.ui/bnd.bnd @@ -1,15 +1,19 @@ -Bundle-ActivationPolicy: lazy -#Bundle-SymbolicName: org.argeo.eclipse.ui;singleton:=true -#Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin -Require-Bundle: org.eclipse.ui;resolution:=optional,\ - org.eclipse.rap.ui;resolution:=optional,\ - org.eclipse.core.runtime -Import-Package: org.springframework.beans.factory,\ - org.springframework.core.io.support,\ +Require-Bundle: org.eclipse.core.runtime +Import-Package: org.eclipse.core.commands,\ + org.eclipse.swt,\ org.eclipse.swt.widgets;version="[0,1)",\ org.osgi.framework;version="[1.5,2)",\ org.osgi.util.tracker;version="[1.4,2)",\ - !org.eclipse.core.runtime,\ - !org.eclipse.core.commands,\ - !org.eclipse.ui.plugin,\ + org.springframework.beans.factory,\ + org.springframework.core.io.support,\ * + + +# Was: +#Bundle-ActivationPolicy: lazy +#Bundle-SymbolicName: org.argeo.eclipse.ui;singleton:=true +#Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin + +#!org.eclipse.core.commands,\ +# !org.eclipse.core.runtime,\ +# !org.eclipse.ui.plugin,\ diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ArgeoUiPlugin.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ArgeoUiPlugin.java deleted file mode 100644 index 6befdf7d4..000000000 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ArgeoUiPlugin.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.eclipse.ui; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.core.runtime.ILogListener; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class ArgeoUiPlugin extends AbstractUIPlugin implements ILogListener { - public static final String PLUGIN_ID = "org.argeo.eclipse.ui"; - private final static Log log = LogFactory.getLog(ArgeoUiPlugin.class); - // The shared instance - private static ArgeoUiPlugin plugin; - - public void start(BundleContext context) throws Exception { - super.start(context); - // weirdly, the start method is called twice... - if (plugin == null) { - plugin = this; - Platform.addLogListener(this); - log.debug("Eclipse logging now directed to standard logging"); - } - } - - public void stop(BundleContext context) throws Exception { - try { - // weirdly, the stop method is called twice... - if (plugin != null) { - Platform.removeLogListener(this); - log.debug("Eclipse logging not directed anymore to standard logging"); - plugin = null; - } - } finally { - super.stop(context); - } - } - - /** Returns the shared instance */ - public static ArgeoUiPlugin getDefault() { - return plugin; - } - - public void logging(IStatus status, String plugin) { - Log pluginLog = LogFactory.getLog(plugin); - Integer severity = status.getSeverity(); - if (severity == IStatus.ERROR) - pluginLog.error(status.getMessage(), status.getException()); - else if (severity == IStatus.WARNING) - pluginLog.warn(status.getMessage(), status.getException()); - else if (severity == IStatus.INFO) - pluginLog.info(status.getMessage(), status.getException()); - else if (severity == IStatus.CANCEL) - if (pluginLog.isDebugEnabled()) - pluginLog.debug(status.getMessage(), status.getException()); - - } - -} diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/Error.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/Error.java deleted file mode 100644 index 03b047001..000000000 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/Error.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.eclipse.ui; - -import org.eclipse.swt.widgets.Shell; - -/** - * @deprecated deprecated because of poor naming, use {@link ErrorFeedback} - * instead - */ -@SuppressWarnings("serial") -@Deprecated -public class Error extends ErrorFeedback { - - public Error(Shell parentShell, String message, Throwable e) { - super(parentShell, message, e); - // TODO Auto-generated constructor stub - } - -} diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/UsersView.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/UsersView.java index a7437156d..0afc409bb 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/UsersView.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/UsersView.java @@ -24,7 +24,7 @@ import javax.jcr.observation.EventIterator; import javax.jcr.observation.EventListener; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.utils.CommandUtils; +import org.argeo.eclipse.ui.workbench.CommandUtils; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.ArgeoTypes; diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/NewUserWizard.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/NewUserWizard.java index c2d041f56..df16aeab4 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/NewUserWizard.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/NewUserWizard.java @@ -21,7 +21,7 @@ import javax.jcr.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.eclipse.ui.ErrorFeedback; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.jcr.JcrUtils; import org.argeo.jcr.UserJcrUtils; import org.argeo.security.UserAdminService; diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java index 288ca623b..a635de186 100644 --- a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java +++ b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.ErrorFeedback; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.util.LocaleUtils; import org.eclipse.equinox.security.auth.ILoginContext; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/org.argeo.security.ui/bnd.bnd b/org.argeo.security.ui/bnd.bnd index 176c72a71..6dbb1d4e4 100644 --- a/org.argeo.security.ui/bnd.bnd +++ b/org.argeo.security.ui/bnd.bnd @@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.ui;resolution:=optional,\ Import-Package: org.argeo.eclipse.spring,\ org.apache.log4j;resolution:=optional,\ - org.eclipse.swt.widgets;version="[0,4.0)",\ + org.eclipse.swt.widgets;version="[0,1.0)",\ + org.osgi.framework;version="[1.4,2)",\ * Export-Packages: !org.argeo.security.ui.internal.*,\ diff --git a/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml index 848fc26c1..06778ec71 100644 --- a/org.argeo.security.ui/pom.xml +++ b/org.argeo.security.ui/pom.xml @@ -22,7 +22,7 @@ org.argeo.commons - org.argeo.eclipse.ui + org.argeo.eclipse.ui.workbench 2.1.12-SNAPSHOT diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenHomePerspective.java b/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenHomePerspective.java index d56498a15..6cc16c79a 100644 --- a/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenHomePerspective.java +++ b/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenHomePerspective.java @@ -15,7 +15,7 @@ */ package org.argeo.security.ui.commands; -import org.argeo.eclipse.ui.ErrorFeedback; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.argeo.security.ui.UserHomePerspective; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/dialogs/ChangePasswordDialog.java b/org.argeo.security.ui/src/org/argeo/security/ui/dialogs/ChangePasswordDialog.java index fe9b6ae9d..3e3af5bf6 100644 --- a/org.argeo.security.ui/src/org/argeo/security/ui/dialogs/ChangePasswordDialog.java +++ b/org.argeo.security.ui/src/org/argeo/security/ui/dialogs/ChangePasswordDialog.java @@ -16,7 +16,7 @@ package org.argeo.security.ui.dialogs; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.ErrorFeedback; +import org.argeo.eclipse.ui.workbench.ErrorFeedback; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; -- 2.30.2