Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
removed some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregjan
gregjan committed Aug 12, 2013
1 parent 3e523b8 commit 5b08dfd
Show file tree
Hide file tree
Showing 23 changed files with 11 additions and 52 deletions.
5 changes: 4 additions & 1 deletion staging/build.properties
View file
Expand Up @@ -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
1 change: 0 additions & 1 deletion staging/src/staging/plugin/views/StagingAreasView.java
View file
Expand Up @@ -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");
Expand Down
1 change: 0 additions & 1 deletion workbench_feature/pom.xml
View file
Expand Up @@ -8,6 +8,5 @@
<version>4.1.4-SNAPSHOT</version>
</parent>
<artifactId>workbench_feature</artifactId>
<version>4.1.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
1 change: 0 additions & 1 deletion workbench_help/build.properties
View file
@@ -1,5 +1,4 @@
source.. = src/main/java/
output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
Expand Down
1 change: 0 additions & 1 deletion workbench_help/pom.xml
View file
Expand Up @@ -9,6 +9,5 @@
<version>4.1.4-SNAPSHOT</version>
</parent>
<artifactId>workbench_help</artifactId>
<version>4.1.4-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
6 changes: 3 additions & 3 deletions workbench_plugin/intro/webresources.xml
View file
Expand Up @@ -36,7 +36,7 @@
</link>
<link
label="Curator’s Workbench Poster"
url="http://www.lib.unc.edu/blogs/cdr/index.php/2010/12/01/poster-curators-workbench/"
url="http://blogs.lib.unc.edu/cdr/index.php/2010/12/01/poster-curators-workbench/"
style-id="content-link"
>
<text>A Curator’s Workbench Poster, prepared for the 2010 International Digital Curation Conference.</text>
Expand Down Expand Up @@ -72,14 +72,14 @@
</link>
<link
label="Software Downloads"
url="http://www.lib.unc.edu/software/"
url="http://www2.lib.unc.edu/software/"
style-id="content-link"
>
<text>Download the workbench from our software download page.</text>
</link>
<link
label="Carolina Digital Repository Blog"
url="http://www.lib.unc.edu/blogs/cdr/"
url="http://blogs.lib.unc.edu/cdr/"
style-id="content-link"
>
<text>The best source for news about the UNC Chapel Hill repository.</text>
Expand Down
2 changes: 0 additions & 2 deletions ...in/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementCommonDropAdapterAssistant.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/arrange/ArrangementLabelProvider.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/CaptureHandler.java
View file
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/LinkOriginalsWizard.java
View file
Expand Up @@ -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
Expand All @@ -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) {
Expand Down
2 changes: 0 additions & 2 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/capture/PickOriginalLocationsPage.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/AutoStageAction.java
View file
Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DeleteDescriptionsCommand.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
1 change: 0 additions & 1 deletion workbench_plugin/src/main/java/unc/lib/cdr/workbench/commands/DivLinkHandler.java
View file
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion ..._plugin/src/main/java/unc/lib/cdr/workbench/commands/OpenSystemEditorTempCopyHandler.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/project/PickExportFilePage.java
View file
Expand Up @@ -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;
Expand All @@ -36,8 +35,6 @@
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;

import staging.plugin.StagingUtils;

/**
* @author Gregory Jansen
*
Expand Down
3 changes: 0 additions & 3 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/Activator.java
View file
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion workbench_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationActionBarAdvisor.java
View file
Expand Up @@ -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 {

Expand Down
1 change: 0 additions & 1 deletion ...nch_plugin/src/main/java/unc/lib/cdr/workbench/rcp/ApplicationWorkbenchWindowAdvisor.java
View file
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions ..._plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNaturePropertiesSection.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/MetsProjectNavigator.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion workbench_plugin/src/main/java/unc/lib/cdr/workbench/views/ViewPartPreviewFile.java
View file
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions workbench_plugin/src/main/java/unc/lib/cdr/workbench/xwalk/SetMappedFeatureCommand.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 5b08dfd

Please sign in to comment.