Mercurial > hg > de.mpg.mpiwg.itgroup.digilib.core
changeset 29:fbcf122a6a24
Working version for textgrid
line wrap: on
line diff
--- a/.classpath Sat Jun 18 09:52:18 2011 +0200 +++ b/.classpath Wed Sep 14 14:41:31 2011 +0200 @@ -3,7 +3,7 @@ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="lib" path="libs/commons-lang-2.3.jar"/> - <classpathentry kind="lib" path="libs/digilibservice-client-1.0-SNAPSHOT.jar"/> + <classpathentry kind="lib" path="libs/digilibservice-client-1.0-SNAPSHOT.jar" sourcepath="/digilibservice/service/src/main/java/info"/> <classpathentry kind="lib" path="libs/jdom-1.0.jar"/> <classpathentry kind="lib" path="libs/jaxen-1.1.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
--- a/plugin.xml Sat Jun 18 09:52:18 2011 +0200 +++ b/plugin.xml Wed Sep 14 14:41:31 2011 +0200 @@ -95,6 +95,9 @@ <input type="de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage"> </input> + <input + type="de.mpg.mpiwg.itgroup.digilib.digiImage.TextGridDigiImage"> + </input> </propertySection> </propertySections> </extension> @@ -119,7 +122,7 @@ <page class="de.mpg.mpiwg.itgroup.digilib.plugin.preferences.PluginPreferencePage" id="de.mpg.mpiwg.itgroup.digilib.core.page1" - name="Digilib Viewer"> + name="Digilib Viewer (Core)"> </page> </extension>
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImage.java Sat Jun 18 09:52:18 2011 +0200 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/DigiImage.java Wed Sep 14 14:41:31 2011 +0200 @@ -226,7 +226,7 @@ * Digiimage shows properties if asked to. */ @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + public DigiImageProperties getAdapter(Class adapter) { if (adapter == IPropertySource.class) return new DigiImageProperties(this);
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/IDigiImage.java Sat Jun 18 09:52:18 2011 +0200 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/IDigiImage.java Wed Sep 14 14:41:31 2011 +0200 @@ -3,7 +3,9 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +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; @@ -60,4 +62,6 @@ */ public Composite getParent(); + public DigiImageProperties getAdapter(Class<IPropertySource> class1); + }
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/TextGridDigiImage.java Sat Jun 18 09:52:18 2011 +0200 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/TextGridDigiImage.java Wed Sep 14 14:41:31 2011 +0200 @@ -16,6 +16,8 @@ import javax.xml.ws.Holder; import org.apache.commons.lang.StringUtils; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; @@ -23,10 +25,15 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.ui.views.properties.IPropertySource; import de.mpg.mpiwg.itgroup.digilib.manipulator.extensions.ZoomAreaRectangleListener; import de.mpg.mpiwg.itgroup.digilib.plugin.editors.DigilibLinkEditorObservable; +import de.mpg.mpiwg.itgroup.digilib.core.plugin.Activator; +import de.mpg.mpiwg.itgroup.digilib.digiImage.properties.DigiImageProperties; + public class TextGridDigiImage implements IDigiImage { //private URL url; private Composite parent; @@ -66,7 +73,14 @@ this.parent = parent; this.dp=dp; try { - service = new DigilibService(new URL("http://localhost:8080/digilibservice-service/service?wsdl")); + AbstractUIPlugin pi = (AbstractUIPlugin)Platform.getPlugin("de.mpg.mpiwg.itgroup.textgrid.digilib"); + IPreferenceStore store = pi.getPreferenceStore(); + + String urlString = store.getString("digiLibService_baseurl"); + + //service = new DigilibService(new URL("http://digilibtextgridservice.mpiwg-berlin.mpg.de/digilibservice/service?wsdl")); + service = new DigilibService(new URL(urlString)); + } catch (MalformedURLException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -176,4 +190,14 @@ return parent; } + + + public DigiImageProperties getAdapter(Class adapter) { + if (adapter == IPropertySource.class) + return new DigiImageProperties(this); + + return null; + + } + }
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImageProperties.java Sat Jun 18 09:52:18 2011 +0200 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImageProperties.java Wed Sep 14 14:41:31 2011 +0200 @@ -8,14 +8,15 @@ import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage; import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImageParameter; +import de.mpg.mpiwg.itgroup.digilib.digiImage.IDigiImage; public class DigiImageProperties implements IPropertySource { //private DigiImageParameter dp; - private DigiImage digiImage; + private IDigiImage digiImage; //private Map<String, String> pt; - public DigiImageProperties(DigiImage digiImage) { + public DigiImageProperties(IDigiImage digiImage) { //this.dp = digiImage.getParameter(); this.digiImage = digiImage; //this.pt = digiImage.getParameter().createMapFromParameters(null);
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertyListener.java Sat Jun 18 09:52:18 2011 +0200 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertyListener.java Wed Sep 14 14:41:31 2011 +0200 @@ -6,6 +6,7 @@ import org.eclipse.ui.views.properties.IPropertySource; import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage; +import de.mpg.mpiwg.itgroup.digilib.digiImage.IDigiImage; /** * @author dwinter @@ -15,10 +16,10 @@ public class DigiImagePropertyListener implements ModifyListener { private String key; - private DigiImage digiImage; - public DigiImagePropertyListener(String key, DigiImage digiImage){ + private IDigiImage digiImage; + public DigiImagePropertyListener(String key, IDigiImage digiImage2){ this.key = key; - this.digiImage = digiImage; + this.digiImage = digiImage2; }
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertySection.java Sat Jun 18 09:52:18 2011 +0200 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/DigiImagePropertySection.java Wed Sep 14 14:41:31 2011 +0200 @@ -22,6 +22,7 @@ import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage; import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImageParameter; +import de.mpg.mpiwg.itgroup.digilib.digiImage.IDigiImage; /** * @author dwinter @@ -30,7 +31,7 @@ */ public class DigiImagePropertySection extends AbstractPropertySection { - private DigiImage digiImage; + private IDigiImage digiImage; private Map<String,Text> texts = new HashMap<String,Text>(); @@ -92,7 +93,7 @@ //Assert.isTrue(input instanceof DigiImage); assert (DigiImage.class.isInstance(input)==true) : "wrong instance type for input"; - this.digiImage = (DigiImage) input; + this.digiImage = (IDigiImage) input; //Map<String, String> pms = digiImage.getParameter().createMapFromParameters(null);
--- a/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/RedrawButtonListener.java Sat Jun 18 09:52:18 2011 +0200 +++ b/src/de/mpg/mpiwg/itgroup/digilib/digiImage/properties/RedrawButtonListener.java Wed Sep 14 14:41:31 2011 +0200 @@ -7,6 +7,7 @@ import org.eclipse.swt.widgets.Text; import de.mpg.mpiwg.itgroup.digilib.digiImage.DigiImage; +import de.mpg.mpiwg.itgroup.digilib.digiImage.IDigiImage; /** * @author dwinter @@ -16,10 +17,10 @@ public class RedrawButtonListener implements MouseListener { - private DigiImage digiImage; + private IDigiImage digiImage; - public RedrawButtonListener(DigiImage digiImage, Map<String, Text> texts) { - this.digiImage=digiImage; + public RedrawButtonListener(IDigiImage digiImage2, Map<String, Text> texts) { + this.digiImage=digiImage2; }
--- a/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorPart.java Sat Jun 18 09:52:18 2011 +0200 +++ b/src/de/mpg/mpiwg/itgroup/digilib/plugin/editors/DigilibLinkEditorPart.java Wed Sep 14 14:41:31 2011 +0200 @@ -192,8 +192,14 @@ //if it is in integer then the argument is the status of the cursor int b = (Integer) arg; - Cursor waitCursor = new Cursor(mainComposite.getDisplay(),b); - mainComposite.setCursor(waitCursor); + + try { + Cursor waitCursor = new Cursor(mainComposite.getDisplay(), b); + mainComposite.setCursor(waitCursor); + } catch (Exception e) { + // TODO: handle exception + + } }