Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

required JVM 1.7 for OSGi environment on product and plugins (several…

… unexpected behaviors fixed)

added confirmation dialogs to delete commands on links, descriptions, acls and arranged items..
fixed checkbox handling in link originals wizard
  • Loading branch information...
commit c131e856c4a56523e3609007608d0058e5b68f6e 1 parent 05ef9b3
@gregjan gregjan authored
View
16 eclipse-repository/workbench.product
@@ -6,7 +6,7 @@
<aboutInfo>
<image path="/workbench_plugin/about.png"/>
<text>
- Curator&apos;s Workbench, version 3
+ Curator&apos;s Workbench, version 4.0.0
The Curator&apos;s Workbench is a project of the Carolina Digital Repository, created by the University Libraries of UNC Chapel Hill.
http://cdr.unc.edu
@@ -22,6 +22,8 @@ Lead Developer: Gregory N. Jansen, count0@email.unc.edu
Project Team:
Erin O&apos;Meara
Jill Sexton
+Ben Pennell
+Jennifer Martin
Special thanks to:
Jackie Dean
@@ -37,7 +39,7 @@ Biff Hollingsworth
<launcherArgs>
<programArgs>-consoleLog -data @user.home/curators-workspace</programArgs>
- <vmArgs>-Dosgi.requiredJavaVersion=1.6 -XX:MaxPermSize=256m -Xms128m -Xmx1024m -Djargon.debug=0 -Dlog4j.configuration=file:./log4j.properties</vmArgs>
+ <vmArgs>-Dosgi.requiredJavaVersion=1.7 -XX:MaxPermSize=256m -Xms128m -Xmx1024m -Djargon.debug=0 -Dlog4j.configuration=file:./log4j.properties</vmArgs>
</launcherArgs>
<windowImages/>
@@ -55,16 +57,16 @@ Biff Hollingsworth
<intro introId="org.eclipse.ui.intro.universal"/>
<vm>
- <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</linux>
- <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos>
- <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</solaris>
- <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
+ <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</linux>
+ <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</macos>
+ <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</solaris>
+ <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>
</vm>
<license>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<text>
- Copyright 2010 The University of North Carolina at Chapel Hill
+ Copyright 2012 The University of North Carolina at Chapel Hill
Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
you may not use this file except in compliance with the License.
View
8 pom.xml
@@ -134,8 +134,8 @@
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
@@ -168,8 +168,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
</plugins>
View
2  workbench_help/META-INF/MANIFEST.MF
@@ -4,4 +4,4 @@ Bundle-Name: Curator's Workbench Help
Bundle-SymbolicName: workbench_help; singleton:=true
Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: UNC Libraries
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
View
2  workbench_plugin/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.300",
crosswalk-gmf.custom;bundle-version="0.0.0",
org.slf4j.log4j12;bundle-version="1.6.6",
org.apache.log4j;bundle-version="1.2.17"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/jargon-core-0.0.2.jar,
View
4 workbench_plugin/plugin.xml
@@ -1410,7 +1410,7 @@
</navigatorContent>
<navigatorContent
activeByDefault="true"
- appearsBefore="workbench_plugin.navigatorContentResources"
+ appearsBefore="cdr-workbench.crosswalksContent"
contentProvider="unc.lib.cdr.workbench.arrange.ArrangementContentProvider"
id="cdr-workbench.arrangementContent"
labelProvider="unc.lib.cdr.workbench.arrange.ArrangementLabelProvider"
@@ -1637,7 +1637,7 @@
</property>
<property
name="introTitle"
- value="Wecome to the Curator&apos;s Workbench - Version 3">
+ value="Wecome to the Curator&apos;s Workbench - Version 4">
</property>
<property
name="introBrandingImage"
View
4 workbench_plugin/src/main/java/unc/lib/cdr/workbench/acl/DeleteAccessControlsCommand.java
@@ -17,6 +17,7 @@
import org.eclipse.emf.common.command.CompoundCommand;
import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -27,6 +28,9 @@
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
IStructuredSelection s = (IStructuredSelection) HandlerUtil.getCurrentSelectionChecked(event);
+ boolean confirmed = MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Delete",
+ "Please confirm that you wish to delete access controls.");
+ if(!confirmed) return null;
Map<IProject, CompoundCommand> deletesByProject = new HashMap<IProject, CompoundCommand>();
for (@SuppressWarnings("rawtypes")
Iterator iter = s.iterator(); iter.hasNext();) {
View
4 workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/RemoveDivHandler.java
@@ -23,6 +23,7 @@
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.handlers.HandlerUtil;
import org.slf4j.Logger;
@@ -47,6 +48,9 @@
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
IStructuredSelection select = (IStructuredSelection) HandlerUtil.getCurrentSelectionChecked(event);
+ boolean confirmed = MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Delete",
+ "Please confirm that you wish to delete (un-capture) the selected part of the arrangement.");
+ if(!confirmed) return null;
for (Object o : select.toList()) {
if (o instanceof DivType) {
DivType d = (DivType) o;
View
4 workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/RemoveSmLinkHandler.java
@@ -9,6 +9,7 @@
import org.eclipse.core.commands.IHandler;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -22,6 +23,9 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = HandlerUtil.getCurrentSelectionChecked(event);
if (!selection.isEmpty()) {
IStructuredSelection sSelection = (IStructuredSelection) selection;
+ boolean confirmed = MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Delete",
+ "Please confirm that you wish to delete this metadata.");
+ if(!confirmed) return null;
if (sSelection.size() == 1) {
if (sSelection.getFirstElement() instanceof SmLinkType) {
SmLinkType link = (SmLinkType) sSelection.getFirstElement();
View
4 workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/PickOriginalLocationsPage.java
@@ -639,9 +639,11 @@ private void updateFileTree() throws URISyntaxException, CoreException {
if (!base.equals(this.fileTreeViewer.getInput())) {
this.fileTreeViewer.setInput(new FileStoreProvider.Root(base));
this.preStageSuffixLabel.setText(base.getName());
- selectFirstCheckbox();
}
}
+ if(this.fileTreeViewer.getCheckedElements().length == 0) {
+ selectFirstCheckbox();
+ }
}
private void updateFromLocationField() {
View
4 workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DeleteDescriptionsCommand.java
@@ -22,6 +22,7 @@
import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -32,6 +33,9 @@
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
IStructuredSelection s = (IStructuredSelection) HandlerUtil.getCurrentSelectionChecked(event);
+ boolean confirmed = MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Delete",
+ "Please confirm that you wish to delete descriptions.");
+ if(!confirmed) return null;
Map<IProject, CompoundCommand> deletesByProject = new HashMap<IProject, CompoundCommand>();
for (@SuppressWarnings("rawtypes")
Iterator iter = s.iterator(); iter.hasNext();) {
View
20 workbench_plugin/src/main/java/unc/lib/cdr/workbench/preferences/Initializer.java
@@ -33,20 +33,24 @@ public Initializer() {
@Override
public void initializeDefaultPreferences() {
List<String[]> locs = new ArrayList<String[]>();
- // add the relative to project folder option (using dynamic path variable for PROJECT_PATH)
- locs.add(new String[] { "Data folder within project (Bag-It style)", "${PROJECT_LOC}/data" });
-
+
locs.add(new String[] { "CDR Production iRODS Grid",
"irods://${USER_NAME}@cdr-vault.libint.unc.edu:3333/cdrZone/home/${USER_NAME}/staging/${PROJECT_NAME}" });
+
+ // set Local Staging Folder
+ String osUserHome = (String) System.getProperties().get("user.home");
+ File dir = new File(osUserHome + "/workbench_staging");
+ locs.add(new String[] { "Staging folder in home directory", dir.toURI().toString() + "/${PROJECT_NAME}" });
+
+ locs.add(new String[] { "StorHouse processing folder", "file:/Z:/in_process/${PROJECT_NAME}" });
+
+ // add the relative to project folder option (using dynamic path variable for PROJECT_PATH)
+ locs.add(new String[] { "Data folder within project (Bag-It style)", "${PROJECT_LOC}/data" });
// add example iRODS path (using dynamic path variable for project name)
locs.add(new String[] { "CDR Test iRODS Grid",
"irods://${USER_NAME}@cdr-dev-vault.libint.unc.edu:5555/cdrTestZone/home/${USER_NAME}/staging/${PROJECT_NAME}" });
-
- // set Local Staging Folder
- String osUserHome = (String) System.getProperties().get("user.home");
- File dir = new File(osUserHome + "/workbench_staging");
- locs.add(new String[] { "Project staging folder in your home directory", dir.toURI().toString() + "/${PROJECT_NAME}" });
+
String str = Activator.convertLocationsToPref(locs);
// Activator.getDefault().getLog().log(new Status(IStatus.INFO, Activator.PLUGIN_ID, "setting defaults: "+str));
Please sign in to comment.
Something went wrong with that request. Please try again.