diff --git a/staging/build.properties b/staging/build.properties
index 7b44e82f..30436790 100644
--- a/staging/build.properties
+++ b/staging/build.properties
@@ -5,4 +5,7 @@ bin.includes = plugin.xml,\
staging-areas-0.0.1-SNAPSHOT.jar,\
jackson-annotations-2.2.2.jar,\
jackson-core-2.2.2.jar,\
- jackson-databind-2.2.2.jar
+ jackson-databind-2.2.2.jar,\
+ initialStagingAreasConfig.json,\
+ icons/,\
+ contexts.xml
diff --git a/staging/src/staging/plugin/views/StagingAreasView.java b/staging/src/staging/plugin/views/StagingAreasView.java
index ececb686..0791ba81 100644
--- a/staging/src/staging/plugin/views/StagingAreasView.java
+++ b/staging/src/staging/plugin/views/StagingAreasView.java
@@ -70,7 +70,6 @@ public class StagingAreasView extends ViewPart {
private Action actionReloadConfiguration;
private Action actionConnect;
private Action actionMapToFolder;
- private Action doubleClickAction;
private ImageDescriptor imageDescrRefresh = StagingPlugin.imageDescriptorFromPlugin(StagingPlugin.PLUGIN_ID, "icons/refresh.gif");
private ImageDescriptor imageDescrMapping = StagingPlugin.imageDescriptorFromPlugin(StagingPlugin.PLUGIN_ID, "icons/synch_synch.gif");
diff --git a/workbench_feature/pom.xml b/workbench_feature/pom.xml
index 92d3aa17..8d4d622a 100644
--- a/workbench_feature/pom.xml
+++ b/workbench_feature/pom.xml
@@ -8,6 +8,5 @@
4.1.4-SNAPSHOT
workbench_feature
- 4.1.4-SNAPSHOT
eclipse-feature
diff --git a/workbench_help/build.properties b/workbench_help/build.properties
index f2dd4863..7438db89 100644
--- a/workbench_help/build.properties
+++ b/workbench_help/build.properties
@@ -1,5 +1,4 @@
source.. = src/main/java/
-output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
diff --git a/workbench_help/pom.xml b/workbench_help/pom.xml
index 826e23c3..00982d83 100644
--- a/workbench_help/pom.xml
+++ b/workbench_help/pom.xml
@@ -9,6 +9,5 @@
4.1.4-SNAPSHOT
workbench_help
- 4.1.4-SNAPSHOT
eclipse-plugin
diff --git a/workbench_plugin/intro/webresources.xml b/workbench_plugin/intro/webresources.xml
index c780c93f..85c14c69 100644
--- a/workbench_plugin/intro/webresources.xml
+++ b/workbench_plugin/intro/webresources.xml
@@ -36,7 +36,7 @@
A Curator’s Workbench Poster, prepared for the 2010 International Digital Curation Conference.
@@ -72,14 +72,14 @@
Download the workbench from our software download page.
The best source for news about the UNC Chapel Hill repository.
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementCommonDropAdapterAssistant.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementCommonDropAdapterAssistant.java
index e9e12bb8..e87eefaf 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementCommonDropAdapterAssistant.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementCommonDropAdapterAssistant.java
@@ -24,10 +24,8 @@
import gov.loc.mets.util.METSUtils;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementLabelProvider.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementLabelProvider.java
index 33abe250..32725717 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementLabelProvider.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementLabelProvider.java
@@ -17,14 +17,11 @@
import gov.loc.mets.DivType;
-import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/CaptureHandler.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/CaptureHandler.java
index 8eed8e29..17ee7ec4 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/CaptureHandler.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/CaptureHandler.java
@@ -16,9 +16,7 @@
package unc.lib.cdr.workbench.capture;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/LinkOriginalsWizard.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/LinkOriginalsWizard.java
index 1c4b9d3e..e6318139 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/LinkOriginalsWizard.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/LinkOriginalsWizard.java
@@ -23,7 +23,8 @@
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.internal.WorkbenchPlugin;
+
+import unc.lib.cdr.workbench.rcp.Activator;
/**
* @author Gregory Jansen
@@ -38,7 +39,7 @@ public class LinkOriginalsWizard extends Wizard implements IImportWizard {
public LinkOriginalsWizard() {
this.setWindowTitle("Import");
- IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings();
+ IDialogSettings workbenchSettings = Activator.getDefault().getDialogSettings();
IDialogSettings section = workbenchSettings
.getSection("LinkOriginalsImportWizard");//$NON-NLS-1$
if (section == null) {
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/PickOriginalLocationsPage.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/PickOriginalLocationsPage.java
index b4fbc1c3..eaf68f93 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/PickOriginalLocationsPage.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/PickOriginalLocationsPage.java
@@ -42,8 +42,6 @@
import org.eclipse.jface.viewers.CheckboxTreeViewer;
import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/AutoStageAction.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/AutoStageAction.java
index 84b6dca6..0ac678a5 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/AutoStageAction.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/AutoStageAction.java
@@ -15,14 +15,11 @@
*/
package unc.lib.cdr.workbench.commands;
-import java.util.Collections;
import java.util.Iterator;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DeleteDescriptionsCommand.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DeleteDescriptionsCommand.java
index 11715388..397c5acc 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DeleteDescriptionsCommand.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DeleteDescriptionsCommand.java
@@ -20,13 +20,9 @@
import gov.loc.mets.MetsPackage;
import gov.loc.mets.util.METSConstants;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
@@ -35,7 +31,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.emf.common.command.CompoundCommand;
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;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DivLinkHandler.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DivLinkHandler.java
index 7628b7d3..93258639 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DivLinkHandler.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DivLinkHandler.java
@@ -35,7 +35,6 @@
import org.eclipse.emf.common.notify.impl.NotificationImpl;
import org.eclipse.emf.edit.command.AddCommand;
import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/OpenSystemEditorTempCopyHandler.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/OpenSystemEditorTempCopyHandler.java
index 6cfa3399..24a81eae 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/OpenSystemEditorTempCopyHandler.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/OpenSystemEditorTempCopyHandler.java
@@ -32,7 +32,6 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/project/PickExportFilePage.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/project/PickExportFilePage.java
index 137c5116..51e7e8b4 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/project/PickExportFilePage.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/project/PickExportFilePage.java
@@ -18,7 +18,6 @@
import java.io.File;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
@@ -36,8 +35,6 @@
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;
-import staging.plugin.StagingUtils;
-
/**
* @author Gregory Jansen
*
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/Activator.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/Activator.java
index 13c38808..a66275cb 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/Activator.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/Activator.java
@@ -15,9 +15,6 @@
*/
package unc.lib.cdr.workbench.rcp;
-import java.util.ArrayList;
-import java.util.List;
-
import org.eclipse.core.commands.Command;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationActionBarAdvisor.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationActionBarAdvisor.java
index cad57c43..c9fb9fea 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationActionBarAdvisor.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationActionBarAdvisor.java
@@ -29,7 +29,6 @@
import org.eclipse.ui.actions.ContributionItemFactory;
import org.eclipse.ui.application.ActionBarAdvisor;
import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.ide.IDEActionFactory;
public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationWorkbenchWindowAdvisor.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationWorkbenchWindowAdvisor.java
index 62e70c9c..5a48d915 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationWorkbenchWindowAdvisor.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationWorkbenchWindowAdvisor.java
@@ -17,7 +17,6 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchPreferenceConstants;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.application.ActionBarAdvisor;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNaturePropertiesSection.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNaturePropertiesSection.java
index ce992947..ee7a88ea 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNaturePropertiesSection.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNaturePropertiesSection.java
@@ -15,12 +15,6 @@
*/
package unc.lib.cdr.workbench.views;
-import java.io.IOException;
-import java.nio.file.FileStore;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.text.NumberFormat;
-
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.ISelection;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNavigator.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNavigator.java
index 7745b3af..1d70ac65 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNavigator.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNavigator.java
@@ -28,7 +28,6 @@
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.internal.Workbench;
import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.CommonViewer;
import org.eclipse.ui.part.FileEditorInput;
@@ -99,7 +98,7 @@ protected void handleDoubleClick(DoubleClickEvent event) {
} else if (object instanceof IFile) {
IFile e = (IFile) object;
FileEditorInput fei = new FileEditorInput(e);
- IEditorDescriptor ed = Workbench.getInstance().getEditorRegistry().getDefaultEditor(e.getName());
+ IEditorDescriptor ed = Activator.getDefault().getWorkbench().getEditorRegistry().getDefaultEditor(e.getName());
if (ed != null) {
try {
getSite().getPage().openEditor(fei, ed.getId(), true);
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/ViewPartPreviewFile.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/ViewPartPreviewFile.java
index 6a67f2a1..ae7589ad 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/ViewPartPreviewFile.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/ViewPartPreviewFile.java
@@ -23,7 +23,6 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
diff --git a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/xwalk/SetMappedFeatureCommand.java b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/xwalk/SetMappedFeatureCommand.java
index 1f60aa36..162c5a61 100644
--- a/workbench_plugin/src/main/java/unc/lib/cdr/workbench/xwalk/SetMappedFeatureCommand.java
+++ b/workbench_plugin/src/main/java/unc/lib/cdr/workbench/xwalk/SetMappedFeatureCommand.java
@@ -15,9 +15,6 @@
*/
package unc.lib.cdr.workbench.xwalk;
-import edu.unc.lib.schemas.acl.AclFactory;
-import edu.unc.lib.schemas.acl.AclPackage;
-import gov.loc.mods.mods.MODSFactory;
import gov.loc.mods.mods.MODSPackage;
import java.util.Collections;
@@ -31,9 +28,6 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EDataTypeImpl;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;