Mercurial > hg > de.mpg.mpiwg.itgroup.digilib.core
changeset 24:1a7940ac5169
minor
line wrap: on
line diff
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImage.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImage.java Wed Jan 05 14:04:58 2011 +0100 @@ -6,12 +6,9 @@ import java.net.URL; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; - - import org.apache.commons.lang.StringUtils; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.ISelection; @@ -22,17 +19,11 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchSite; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.views.properties.IPropertySource; import de.mpg.mpiwg.itgroup.digilib.digiImage.properties.DigiImageProperties; import de.mpg.mpiwg.itgroup.digilib.manipulator.extensions.ZoomAreaRectangleListener; import de.mpg.mpiwg.itgroup.digilib.plugin.Activator; -import de.mpg.mpiwg.itgroup.digilib.plugin.PluginPreferenceInitializer; import de.mpg.mpiwg.itgroup.digilib.plugin.PluginPreferencePage; import de.mpg.mpiwg.itgroup.digilib.plugin.editors.DigilibLinkEditorObservable; @@ -229,9 +220,10 @@ /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - * + * * Digiimage shows properties if asked to. */ + @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) return new DigiImageProperties(this);
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImageController.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImageController.java Wed Jan 05 14:04:58 2011 +0100 @@ -1,16 +1,9 @@ package de.mpg.mpiwg.itgroup.digilib.digiImage; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.graphics.Point;
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImageParameter.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImageParameter.java Wed Jan 05 14:04:58 2011 +0100 @@ -1,16 +1,10 @@ package de.mpg.mpiwg.itgroup.digilib.digiImage; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.sun.xml.xsom.impl.parser.DelayedRef.Type; - -import de.mpg.mpiwg.itgroup.digilib.plugin.editors.DigilibLinkEditorObservable; - /** * Parameter which describe the state of an Digilib-Image, * settings and parameter names are described in @see {@link http://developer.berlios.de/docman/?group_id=251}
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImageProperties.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImageProperties.java Wed Jan 05 14:04:58 2011 +0100 @@ -4,13 +4,10 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.ui.views.properties.PropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage; -import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImageController; import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImageParameter; -import de.mpg.mpiwg.itgroup.digilib.plugin.editors.DigilibLinkEditorObservable; public class DigiImageProperties implements IPropertySource {
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/Rotate.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/Rotate.java Wed Jan 05 14:04:58 2011 +0100 @@ -11,7 +11,6 @@ import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImageController; import de.mpg.mpiwg.itgroup.digilib.manipulator.extensions.dialogs.RotateDialog; -import de.mpg.mpiwg.itgroup.digilib.plugin.editors.DigilibLinkEditorObservable; /** * Open an dialog for entering the ration angle.
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ScaleUp.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ScaleUp.java Wed Jan 05 14:04:58 2011 +0100 @@ -3,7 +3,6 @@ -import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImageController;
--- a/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ZoomAreaRectangleListener.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/manipulator/extensions/ZoomAreaRectangleListener.java Wed Jan 05 14:04:58 2011 +0100 @@ -28,6 +28,7 @@ private DigiImageController dc; + @SuppressWarnings("unused") private ZoomAreaRectangleListener() {}; public ZoomAreaRectangleListener(DigiImageController dc){
--- a/src/de/mpg/mpiwg/itgroup/digilib/plugin/Activator.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/plugin/Activator.java Wed Jan 05 14:04:58 2011 +0100 @@ -1,6 +1,5 @@ package de.mpg.mpiwg.itgroup.digilib.plugin; -import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext;
--- a/src/de/mpg/mpiwg/itgroup/digilib/plugin/PluginPreferenceInitializer.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/plugin/PluginPreferenceInitializer.java Wed Jan 05 14:04:58 2011 +0100 @@ -1,8 +1,6 @@ package de.mpg.mpiwg.itgroup.digilib.plugin; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.core.runtime.preferences.DefaultScope; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.preference.IPreferenceStore;
--- a/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorInput.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorInput.java Wed Jan 05 14:04:58 2011 +0100 @@ -47,6 +47,7 @@ setType(type); } + @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { // TODO Auto-generated method stub return null;
--- a/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorObservable.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorObservable.java Wed Jan 05 14:04:58 2011 +0100 @@ -2,8 +2,6 @@ import java.util.Observable; -import org.eclipse.swt.SWT; - import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage; public class DigilibLinkEditorObservable extends Observable {
--- a/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorPart.java Wed Jan 05 13:00:53 2011 +0100 +++ b/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorPart.java Wed Jan 05 14:04:58 2011 +0100 @@ -40,18 +40,6 @@ private Composite mainComposite; private ScrolledComposite sc; - //private ISelection selection; - //private List<ISelectionChangedListener> selectionChangeListener = new ArrayList<ISelectionChangedListener>(); - private Object propertySheetPage; - - /* (non-Javadoc) - * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent) - */ - //public void resourceChanged(IResourceChangeEvent event) { - // TODO Auto-generated method stub - - //} - @Override public void doSave(IProgressMonitor monitor) { // TODO Auto-generated method stub @@ -140,7 +128,7 @@ DigiImage digiImage = new DigiImage(mainComposite, SWT.BORDER, dp); DigiImageController digiImageController = new DigiImageController(digiImage); //imageComp.setBackgroundImage(img); - DigiNav digiNav = new DigiNav(mainComposite,SWT.NONE,digiImageController); + new DigiNav(mainComposite,SWT.NONE,digiImageController); getSite().setSelectionProvider(digiImage); digiImage.setSelection(new StructuredSelection(digiImage));