Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15688] weasis/weasis_framework/trunk
|
From: <nr...@us...> - 2011-07-17 20:53:05
|
Revision: 15688
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15688&view=rev
Author: nroduit
Date: 2011-07-17 20:52:56 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Add factory to build preferences panel in EDT
Modified Paths:
--------------
weasis/weasis_framework/trunk/pom.xml
weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/PreferenceDialog.java
weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/internal/Activator.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractItemDialogPage.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractWizardDialog.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/PageProps.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/TreeSelection.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/GridBagLayoutModel.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/LayoutConstraints.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ByteLutCollection.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/EnhancementOp.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ThresholdToBinDescriptor.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/AbbreviationUnit.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/Unit.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/MediaSeriesGroupNode.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ImageViewerPlugin.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ViewerPlugin.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/Measure1DAnalyse.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/RasterizeGraphicsToCoord.java
weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/SimpleTableModel.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/resources/OSGI-INF/Preferences.xml
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/resources/OSGI-INF/Preferences.xml
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/resources/OSGI-INF/Preferences.xml
weasis/weasis_framework/trunk/weasis-parent/pom.xml
Added Paths:
-----------
weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/PreferencesPageFactory.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/pref/DicomPrefFactory.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/pref/WadoPrefFactory.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/ViewerPrefFactory.java
Modified: weasis/weasis_framework/trunk/pom.xml
===================================================================
--- weasis/weasis_framework/trunk/pom.xml 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/pom.xml 2011-07-17 20:52:56 UTC (rev 15688)
@@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/PreferenceDialog.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/PreferenceDialog.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/PreferenceDialog.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -16,6 +16,7 @@
import org.weasis.base.ui.Messages;
import org.weasis.base.ui.internal.Activator;
+import org.weasis.core.api.gui.PreferencesPageFactory;
import org.weasis.core.api.gui.util.AbstractWizardDialog;
public class PreferenceDialog extends AbstractWizardDialog {
@@ -32,7 +33,10 @@
pagesRoot.add(new DefaultMutableTreeNode(new GeneralSetting()));
final Object[] servicesPref = Activator.getPreferencesPages();
for (int i = 0; (servicesPref != null) && (i < servicesPref.length); i++) {
- pagesRoot.add(new DefaultMutableTreeNode(servicesPref[i]));
+ if (servicesPref[i] instanceof PreferencesPageFactory) {
+ pagesRoot.add(new DefaultMutableTreeNode(((PreferencesPageFactory) servicesPref[i])
+ .createPreferencesPage(null)));
+ }
}
iniTree();
}
Modified: weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/internal/Activator.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/internal/Activator.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/internal/Activator.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -25,8 +25,8 @@
import org.weasis.base.ui.WeasisApp;
import org.weasis.base.ui.gui.WeasisWin;
import org.weasis.core.api.explorer.DataExplorerView;
+import org.weasis.core.api.gui.PreferencesPageFactory;
import org.weasis.core.api.gui.util.GuiExecutor;
-import org.weasis.core.api.gui.util.PageProps;
import org.weasis.core.ui.docking.DockableTool;
import org.weasis.core.ui.docking.UIManager;
@@ -44,10 +44,19 @@
// Load the bundle preferences
// PREFERENCES.init(context);
- prefs_tracker = new ServiceTracker(context, PageProps.class.getName(), null);
+ prefs_tracker = new ServiceTracker(context, PreferencesPageFactory.class.getName(), null);
+ try {
+ // Must keep the tracker open, because calling close() will unget service. This is a problem because
+ // the deactivate method is called although the service stay alive in UI.
+ prefs_tracker.open();
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
// WeasisWin must be instantiate in the EDT
GuiExecutor.instance().invokeAndWait(new Runnable() {
+ @Override
public void run() {
final WeasisWin app = WeasisWin.getInstance();
try {
@@ -73,16 +82,8 @@
// Explorer (with non immediate instance)
GuiExecutor.instance().execute(new Runnable() {
+ @Override
public void run() {
- try {
- // Must keep the tracker open, because calling close() will unget service. This is a problem because
- // the desactivate method is called although the service stay alive in UI.
- prefs_tracker.open();
-
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
ServiceTracker m_tracker = new ServiceTracker(context, DataExplorerView.class.getName(), null);
// Must keep the tracker open, because calling close() will unget service. This is a problem because the
// desactivate method is called although the service stay alive in UI.
@@ -93,13 +94,7 @@
if (!UIManager.EXPLORER_PLUGINS.contains(services[i])
&& services[i] instanceof DataExplorerView) {
final DataExplorerView explorer = (DataExplorerView) services[i];
- // if ("Media Explorer".equals(explorer.getUIName())) { //$NON-NLS-1$
- // // in this case, if there are several Explorers, the Media Explorer is selected by
- // // default
- // UIManager.EXPLORER_PLUGINS.add(0, explorer);
- // } else {
UIManager.EXPLORER_PLUGINS.add(explorer);
- // }
if (explorer.getDataExplorerModel() != null) {
explorer.getDataExplorerModel().addPropertyChangeListener(WeasisWin.getInstance());
@@ -132,17 +127,18 @@
this.context = null;
}
+ @Override
public synchronized void serviceChanged(final ServiceEvent event) {
// Explorer (with non immediate instance) and WeasisWin must be instantiate in the EDT
GuiExecutor.instance().execute(new Runnable() {
+ @Override
public void run() {
final ServiceReference m_ref = event.getServiceReference();
Object service = context.getService(m_ref);
- if (service == null) {
+ if (service == null)
return;
- }
if (service instanceof DataExplorerView) {
final DataExplorerView explorer = (DataExplorerView) service;
synchronized (UIManager.EXPLORER_PLUGINS) {
@@ -170,6 +166,7 @@
} else if (event.getType() == ServiceEvent.UNREGISTERING) {
GuiExecutor.instance().execute(new Runnable() {
+ @Override
public void run() {
if (UIManager.EXPLORER_PLUGINS.contains(explorer)) {
if (explorer.getDataExplorerModel() != null) {
Added: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/PreferencesPageFactory.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/PreferencesPageFactory.java (rev 0)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/PreferencesPageFactory.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -0,0 +1,11 @@
+package org.weasis.core.api.gui;
+
+import java.util.Hashtable;
+
+import org.weasis.core.api.gui.util.AbstractItemDialogPage;
+
+public interface PreferencesPageFactory {
+
+ public AbstractItemDialogPage createPreferencesPage(Hashtable<String, Object> properties);
+
+}
Property changes on: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/PreferencesPageFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractItemDialogPage.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractItemDialogPage.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractItemDialogPage.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -11,40 +11,24 @@
package org.weasis.core.api.gui.util;
import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.swing.JPanel;
-/**
- * <p>
- * Title: PetroSpector
- * </p>
- * <p>
- * Description: Thin sections analysis
- * </p>
- * <p>
- * Copyright: Copyright (c) 2002
- * </p>
- * <p>
- * Company:
- * </p>
- *
- * @author non attribuable
- * @version 1.0
- */
-
public abstract class AbstractItemDialogPage extends JPanel implements PageProps {
+ protected final static AtomicInteger keyGenerator = new AtomicInteger(0);
+ private final String key;
+ private String title;
+ private java.util.List<PageProps> subPageList;
- private static int _lastKey;
- private final String _key;
- private String _title;
- private java.util.List<PageProps> _subPageList;
-
public AbstractItemDialogPage() {
- _key = getClass().getName().concat(String.valueOf(_lastKey++));
+ key = String.valueOf(keyGenerator.incrementAndGet());
}
+ @Override
public abstract void resetoDefaultValues();
+ @Override
public abstract void closeAdditionalWindow();
public void deselectPageAction() {
@@ -53,53 +37,53 @@
public void selectPageAction() {
}
+ @Override
public String getKey() {
- return _key;
+ return key;
}
+ @Override
public String getTitle() {
- return _title;
+ return title;
}
public void setTitle(String title) {
- _title = title;
+ this.title = title;
}
public void addSubPage(PageProps subPage) {
- if (_subPageList == null) {
- _subPageList = new ArrayList<PageProps>();
+ if (subPageList == null) {
+ subPageList = new ArrayList<PageProps>();
}
- _subPageList.add(subPage);
+ subPageList.add(subPage);
}
public void removeSubPage(PageProps subPage) {
- if (_subPageList == null) {
+ if (subPageList == null)
return;
- }
- _subPageList.remove(subPage);
+ subPageList.remove(subPage);
}
+ @Override
public PageProps[] getSubPages() {
- if (_subPageList == null) {
+ if (subPageList == null)
return null;
- }
- final PageProps[] subPages = new PageProps[_subPageList.size()];
- _subPageList.toArray(subPages);
+ final PageProps[] subPages = new PageProps[subPageList.size()];
+ subPageList.toArray(subPages);
return subPages;
}
public void resetAllSubPagesToDefaultValues() {
- if (_subPageList == null) {
+ if (subPageList == null)
return;
- }
- for (PageProps subPage : _subPageList) {
+ for (PageProps subPage : subPageList) {
subPage.resetoDefaultValues();
}
}
@Override
public String toString() {
- return _title;
+ return title;
}
}
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractWizardDialog.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractWizardDialog.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/AbstractWizardDialog.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -31,24 +31,6 @@
import org.weasis.core.api.Messages;
-/**
- * <p>
- * Title: PetroSpector
- * </p>
- * <p>
- * Description: Thin sections analysis
- * </p>
- * <p>
- * Copyright: Copyright (c) 2002
- * </p>
- * <p>
- * Company:
- * </p>
- *
- * @author non attribuable
- * @version 1.0
- */
-
public abstract class AbstractWizardDialog extends JDialog {
protected String settingTitle;
@@ -82,6 +64,7 @@
jButtonClose.addActionListener(new java.awt.event.ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
cancel();
}
@@ -125,9 +108,8 @@
object = jScrollPanePage.getViewport().getComponent(0);
} catch (Exception ex) {
}
- if (object instanceof AbstractItemDialogPage) {
+ if (object instanceof AbstractItemDialogPage)
return (AbstractItemDialogPage) object;
- }
return null;
}
@@ -167,6 +149,7 @@
tree.constructTree(model);
tree.addTreeSelectionListener(new TreeSelectionListener() {
+ @Override
public void valueChanged(TreeSelectionEvent e) {
if (e.getNewLeadSelectionPath() != null) {
DefaultMutableTreeNode object =
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/PageProps.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/PageProps.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/PageProps.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -10,24 +10,6 @@
******************************************************************************/
package org.weasis.core.api.gui.util;
-/**
- * <p>
- * Title: JMicroVision
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Copyright: Copyright (c) 2002 -2004
- * </p>
- * <p>
- * Company:
- * </p>
- *
- * @author Nicolas Roduit
- * @version 1.0
- */
-
public interface PageProps {
public void resetoDefaultValues();
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/TreeSelection.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/TreeSelection.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/TreeSelection.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -22,28 +22,6 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.weasis.core.api.Messages;
-
-/**
- * <p>
- * Title: JMicroVision
- * </p>
- *
- * <p>
- * Description: ImageJai processing and analysis
- * </p>
- *
- * <p>
- * Copyright: Copyright (c) 2002 -2005
- * </p>
- *
- * <p>
- * Company:
- * </p>
- *
- * @author Nicolas Roduit
- * @version 1.2.2
- */
public class TreeSelection extends JTree {
public void constructTree(DefaultTreeModel model) {
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/GridBagLayoutModel.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/GridBagLayoutModel.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/GridBagLayoutModel.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -27,6 +27,10 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+/**
+ * GridBagLayoutModel is the model for the plugin container.
+ *
+ */
public class GridBagLayoutModel implements GUIEntry {
private String title;
@@ -55,9 +59,8 @@
}
public GridBagLayoutModel(LinkedHashMap<LayoutConstraints, JComponent> constraints, String title, Icon icon) {
- if (constraints == null) {
+ if (constraints == null)
throw new IllegalArgumentException("constraints cannot be null");
- }
this.title = title;
this.icon = icon;
this.constraints = constraints;
@@ -98,20 +101,54 @@
}
private final class SAXAdapter extends DefaultHandler {
+ /**
+ * Specifies the component position and size
+ *
+ */
+ /**
+ * @see java.awt.GridBagConstraints#gridx
+ */
private int x;
+ /**
+ * @see java.awt.GridBagConstraints#gridy
+ */
private int y;
+ /**
+ * @see java.awt.GridBagConstraints#gridwidth
+ */
private int width;
+ /**
+ * @see java.awt.GridBagConstraints#gridheight
+ */
private int height;
+ /**
+ * @see java.awt.GridBagConstraints#weightX
+ */
private double weightx;
+ /**
+ * @see java.awt.GridBagConstraints#weighty
+ */
private double weighty;
+ /**
+ * @see java.awt.GridBagConstraints#anchor
+ */
private int position;
+ /**
+ * @see java.awt.GridBagConstraints#fill
+ */
private int expand;
+ /**
+ * The component class
+ */
private String type;
- private final int increment = 0;
+ /**
+ * ID of the component
+ */
+ private int increment = 0;
- int tag = -1;
- StringBuffer name = new StringBuffer(80);
+ private int tag = -1;
+ private StringBuffer name = new StringBuffer(80);
@Override
public void characters(char[] ch, int start, int length) throws SAXException {
@@ -141,6 +178,7 @@
@Override
public void endElement(String uri, String localName, String qName) throws SAXException {
if ("element".equals(qName)) { //$NON-NLS-1$
+ increment++;
constraints.put(new LayoutConstraints(type, increment, x, y, width, height, weightx, weighty, position,
expand), null);
name.setLength(0);
@@ -149,14 +187,12 @@
}
private double getDoubleValue(String val) {
- if (val.trim().equals("")) { //$NON-NLS-1$
+ if (val.trim().equals(""))
return 0.0;
- }
// handle fraction format
int index = val.indexOf('/');
- if (index != -1) {
+ if (index != -1)
return (double) Integer.parseInt(val.substring(0, index)) / Integer.parseInt(val.substring(index + 1));
- }
return Double.parseDouble(val);
}
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/LayoutConstraints.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/LayoutConstraints.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/LayoutConstraints.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -33,6 +33,7 @@
return layoutID;
}
+ @Override
public int compareTo(LayoutConstraints o) {
return (layoutID < o.layoutID ? -1 : (layoutID == o.layoutID ? 0 : 1));
}
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ByteLutCollection.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ByteLutCollection.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ByteLutCollection.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -15,8 +15,6 @@
import java.util.List;
import java.util.Scanner;
-import org.weasis.core.api.Messages;
-
/**
* <code>ByteLutCollection</code> contains a collection of lookup tables (LUT).
* <p>
@@ -27,8 +25,8 @@
* pb.add(lookup);<br>
* PlanarImage dst = JAI.create("lookup", pb, null);</code></blockquote>
* <p>
- * JMicroVision - Copyright (c) 2002 -2006 Nicolas Roduit
*
+ *
* @author Nicolas Roduit
* @version 1.2.0
* @since 1.0.0
@@ -40,9 +38,9 @@
* The names of the LUT collection. The name position corresponds to the index value of the mehtod
* <code>getLUT(int index)</code>.
*/
- public final static String[] LUT_COLLECTION =
- { "Default", "Gray", "Red to yellow", "Fire", "Ice", "Hot", "Spectrum", "Rainbow 1", "Rainbow 2", "Rainbow 3", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
- "Rainbow 4" }; //$NON-NLS-1$
+ public final static String[] LUT_COLLECTION = {
+ "Default", "Gray", "Red to yellow", "Fire", "Ice", "Hot", "Spectrum", "Rainbow 1", "Rainbow 2", "Rainbow 3", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+ "Rainbow 4" }; //$NON-NLS-1$
/**
* the Red to yellow LUT
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/EnhancementOp.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/EnhancementOp.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/EnhancementOp.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -28,33 +28,12 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import org.weasis.core.api.Messages;
import org.weasis.core.api.gui.util.JMVUtils;
-/**
- * <p>
- * Title: JMicroVision
- * </p>
- *
- * <p>
- * Description:
- * </p>
- *
- * <p>
- * Copyright: Copyright (c) 2002 -2004
- * </p>
- *
- * <p>
- * Company:
- * </p>
- *
- * @author Nicolas Roduit
- * @version 1.1
- */
public class EnhancementOp extends JPanel {
- public static final String[] histoLabels =
- { "None", "Manual Enhancement", "Automatic Levels", "Equalized Levels", "Background subtraction" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ public static final String[] histoLabels = {
+ "None", "Manual Enhancement", "Automatic Levels", "Equalized Levels", "Background subtraction" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
private Contrast contrast;
private JPanel jPanel1 = new JPanel();
@@ -78,6 +57,7 @@
jSlider1.setValue(127);
jSlider1.addChangeListener(new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
updateValues();
}
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ThresholdToBinDescriptor.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ThresholdToBinDescriptor.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/op/ThresholdToBinDescriptor.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -10,23 +10,6 @@
******************************************************************************/
package org.weasis.core.api.image.op;
-/**
- * <p>
- * Title: JMicroVision
- * </p>
- * <p>
- * Description: Thin section analysis
- * </p>
- * <p>
- * Copyright: Copyright (c) 2002
- * </p>
- * <p>
- * Company:
- * </p>
- *
- * @author Nicolas Roduit
- * @version 1.0
- */
import java.awt.RenderingHints;
import java.awt.image.RenderedImage;
import java.awt.image.renderable.ParameterBlock;
@@ -78,13 +61,12 @@
* Creates a SampleOpImage with the given ParameterBlock if the SampleOpImage can handle the particular
* ParameterBlock.
*/
+ @Override
public RenderedImage create(ParameterBlock parameterblock, RenderingHints renderHints) {
- if (!validateParameters(parameterblock)) {
+ if (!validateParameters(parameterblock))
return null;
- }
- if (!validateSources(parameterblock)) {
+ if (!validateSources(parameterblock))
return null;
- }
renderHints = LayoutUtil.createBinaryRenderedImage();
ImageLayout imagelayout = LayoutUtil.getImageLayoutHint(renderHints);
return new ThresholdToBinOpImage(parameterblock.getRenderedSource(0), renderHints, imagelayout,
@@ -97,12 +79,10 @@
public boolean validateParameters(ParameterBlock paramBlock) {
for (int i = 0; i < 2; i++) {
Object arg = paramBlock.getObjectParameter(i);
- if (arg == null) {
+ if (arg == null)
return false;
- }
- if (!(arg instanceof Double)) {
+ if (!(arg instanceof Double))
return false;
- }
}
return true;
}
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/AbbreviationUnit.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/AbbreviationUnit.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/AbbreviationUnit.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -14,7 +14,6 @@
* <code>AbbreviationUnit</code> is similar to the Class <code>Unit</code>, except that the method
* <code>toString()</code> returns the abbreviation of the unit.
* <p>
- * JMicroVision - Copyright (c) 2002 -2006 Nicolas Roduit
*
* @author Nicolas Roduit
* @see oorg.weasis.core.api.image.util.Unit
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/Unit.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/Unit.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/image/util/Unit.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -14,26 +14,6 @@
import org.weasis.core.api.Messages;
-/**
- * <p>
- * Title: JMicroVision
- * </p>
- *
- * <p>
- * Description:
- * </p>
- *
- * <p>
- * Copyright: Copyright (c) 2002 -2004
- * </p>
- *
- * <p>
- * Company:
- * </p>
- *
- * @author Nicolas Roduit
- * @version 1.1
- */
public enum Unit {
PIXEL(-5, Messages.getString("Unit.pix"), Messages.getString("Unit.pix_s"), 1.0), //$NON-NLS-1$ //$NON-NLS-2$
/*
@@ -127,9 +107,8 @@
public static Unit getCurrentIdUnit(int id) {
for (Unit u : Unit.values()) {
- if (id == u.getId()) {
+ if (id == u.getId())
return u;
- }
}
return Unit.PIXEL;
}
@@ -144,18 +123,16 @@
public Unit getUpUnit() {
for (Unit u : Unit.values()) {
- if (u.getId() - getId() == 1) {
+ if (u.getId() - getId() == 1)
return u;
- }
}
return null;
}
public Unit getDownUnit() {
for (Unit u : Unit.values()) {
- if (getId() - u.getId() == 1) {
+ if (getId() - u.getId() == 1)
return u;
- }
}
return null;
}
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/MediaSeriesGroupNode.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/MediaSeriesGroupNode.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/media/data/MediaSeriesGroupNode.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -31,19 +31,20 @@
}
public MediaSeriesGroupNode(TagW tagID, Object identifier, TagW displayTag) {
- if (tagID == null || identifier == null) {
+ if (tagID == null || identifier == null)
throw new IllegalArgumentException("tagID or identifier cannot be null"); //$NON-NLS-1$
- }
this.displayTag = displayTag == null ? tagID : displayTag;
this.tags = new HashMap<TagW, Object>();
this.tagID = tagID;
tags.put(tagID, identifier);
}
+ @Override
public TagW getTagID() {
return tagID;
}
+ @Override
public boolean containTagKey(TagW tag) {
return tags.containsKey(tag);
}
@@ -61,12 +62,10 @@
@Override
public boolean equals(Object obj) {
Object value1 = tags.get(tagID);
- if (value1 == obj) {
+ if (value1 == obj)
return true;
- }
- if (value1 == null) {
+ if (value1 == null)
return false;
- }
if (obj instanceof MediaSeriesGroupNode) {
Object value2 = ((MediaSeriesGroupNode) obj).tags.get(tagID);
return value1.equals(value2);
@@ -77,39 +76,40 @@
@Override
public int hashCode() {
Object val = tags.get(tagID);
- if (val instanceof Integer) {
+ if (val instanceof Integer)
return (Integer) val;
- }
- // Should never happens, but it does ?
- if (val == null) {
- return this.hashCode();
- }
+ // Should never happens, but it does very rarely ?
+ if (val == null)
+ return super.hashCode();
return val.hashCode();
}
+ @Override
public void setTag(TagW tag, Object value) {
if (tag != null) {
tags.put(tag, value);
}
}
+ @Override
public void setTagNoNull(TagW tag, Object value) {
if (tag != null && value != null) {
tags.put(tag, value);
}
}
+ @Override
public Object getTagValue(TagW tag) {
return tags.get(tag);
}
+ @Override
public TagW getTagElement(int id) {
Iterator<TagW> enumVal = tags.keySet().iterator();
while (enumVal.hasNext()) {
TagW e = enumVal.next();
- if (e.getId() == id) {
+ if (e.getId() == id)
return e;
- }
}
return null;
}
@@ -118,6 +118,7 @@
return tags.entrySet().iterator();
}
+ @Override
public void dispose() {
}
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ImageViewerPlugin.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ImageViewerPlugin.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ImageViewerPlugin.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -13,18 +13,25 @@
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Cursor;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.Point;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry;
+import javax.accessibility.Accessible;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JComponent;
import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
import javax.swing.plaf.PanelUI;
import org.weasis.core.api.gui.util.ActionState;
@@ -105,6 +112,8 @@
protected final JPanel grid;
protected GridBagLayoutModel layoutModel;
+ // private final MouseHandler mouseHandler;
+
public ImageViewerPlugin(ImageViewerEventManager<E> eventManager, String PluginName) {
this(eventManager, VIEWS_1x1, PluginName, null, null);
}
@@ -127,6 +136,9 @@
add(grid, BorderLayout.CENTER);
setLayoutModel(layoutModel);
+ // this.mouseHandler = new MouseHandler();
+ // grid.addMouseListener(mouseHandler);
+ // grid.addMouseMotionListener(mouseHandler);
}
/**
@@ -521,4 +533,51 @@
}
}
}
+
+ class MouseHandler extends MouseAdapter {
+ private Point pickPoint = null;
+ private int pickWidth;
+ private int pickHeight;
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ pickPoint = e.getPoint();
+ pickWidth = getWidth();
+ pickHeight = getHeight();
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent mouseevent) {
+ pickPoint = null;
+ }
+
+ @Override
+ public void mouseDragged(MouseEvent e) {
+ int mods = e.getModifiers();
+ if (pickPoint != null && (mods & InputEvent.BUTTON1_MASK) != 0) {
+ Point p = e.getPoint();
+ Accessible comp = SwingUtilities.getAccessibleAt(e.getComponent(), p);
+ int dx = p.x - pickPoint.x;
+ int dy = p.y - pickPoint.y;
+
+ int nw = pickWidth + dx;
+ int nh = pickHeight + dy;
+ nw = nw < 50 ? 50 : nw > 500 ? 500 : nw;
+ nh = nh < 50 ? 50 : nh > 500 ? 500 : nh;
+
+ setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR));
+ }
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent me) {
+ setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR));
+ }
+
+ @Override
+ public void mouseExited(MouseEvent mouseEvent) {
+ setCursor(Cursor.getDefaultCursor());
+ }
+
+ }
}
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ViewerPlugin.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ViewerPlugin.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/editor/image/ViewerPlugin.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -25,12 +25,6 @@
import org.weasis.core.ui.editor.SeriesViewer;
import org.weasis.core.ui.util.WtoolBar;
-/**
- * "Home" interface for particular tool. It is used by application core to start up tool when user selects appropriate
- * "tab" on the main application window.
- *
- * @version $Id: ViewerPlugin.java,v 1.1 2008/08/29 14:26:31 nirt Exp $
- */
public abstract class ViewerPlugin<E extends MediaElement> extends JPanel implements SeriesViewer<E> {
private final String dockableUID;
@@ -78,6 +72,7 @@
this.dockableUID = "" + UIManager.dockableUIGenerator.getAndIncrement(); //$NON-NLS-1$
}
+ @Override
public MediaSeriesGroup getGroupID() {
return groupID;
}
@@ -86,6 +81,7 @@
this.groupID = groupID;
}
+ @Override
public String getPluginName() {
return pluginName;
}
@@ -119,6 +115,7 @@
this.requestFocusInWindow();
}
+ @Override
public void close() {
UIManager.VIEWER_PLUGINS.remove(ViewerPlugin.this);
}
@@ -131,9 +128,8 @@
WtoolBar[] bars = getToolBar();
if (bars != null) {
for (WtoolBar t : bars) {
- if (t instanceof ViewerToolBar) {
+ if (t instanceof ViewerToolBar)
return (ViewerToolBar) t;
- }
}
}
return null;
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/Measure1DAnalyse.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/Measure1DAnalyse.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/Measure1DAnalyse.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -11,24 +11,6 @@
import org.weasis.core.api.gui.util.MathUtil;
import org.weasis.core.api.image.measure.MeasurementsAdapter;
-/**
- * <p>
- * Title: PetroSpector
- * </p>
- * <p>
- * Description: Thin sections analysis
- * </p>
- * <p>
- * Copyright: Copyright (c) 2002
- * </p>
- * <p>
- * Company:
- * </p>
- *
- * @author non attribuable
- * @version 1.0
- */
-
public class Measure1DAnalyse {
public final static String[] measurList = { "First point X", "First point Y", "Last point X", "Last point Y",
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/RasterizeGraphicsToCoord.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/RasterizeGraphicsToCoord.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/graphic/RasterizeGraphicsToCoord.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -8,26 +8,6 @@
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
-/**
- * <p>
- * Title: JMicroVision
- * </p>
- *
- * <p>
- * Description: Image processing and analysis
- * </p>
- *
- * <p>
- * Copyright: Copyright (c) 2002 -2005
- * </p>
- *
- * <p>
- * Company:
- * </p>
- *
- * @author Nicolas Roduit
- * @version 1.2.0
- */
public class RasterizeGraphicsToCoord {
public static ArrayList<ChainPoint> rasterizeSegment(int x0, int y0, int x1, int y1) {
@@ -109,27 +89,24 @@
int x = next.x - last.x;
int y = next.y - last.y;
if (x == 1) {
- if (y == 1) {
+ if (y == 1)
return (byte) 7;
- } else if (y == -1) {
+ else if (y == -1)
return (byte) 1;
- } else {
+ else
return (byte) 0;
- }
} else if (x == -1) {
- if (y == 1) {
+ if (y == 1)
return (byte) 5;
- } else if (y == -1) {
+ else if (y == -1)
return (byte) 3;
- } else {
+ else
return (byte) 4;
- }
} else {
- if (y == 1) {
+ if (y == 1)
return (byte) 6;
- } else {
+ else
return (byte) 2;
- }
}
}
@@ -264,9 +241,8 @@
}
public static float[] transformToCounterCockWiseCoord(float[] coord) {
- if (coord == null || coord.length < 6) {
+ if (coord == null || coord.length < 6)
return coord;
- }
int index = 0;
float miny = Float.MAX_VALUE;
float minx = Float.MIN_VALUE;
@@ -315,9 +291,8 @@
}
public static ArrayList<ChainPoint> transformShapeToContour(Shape shape) {
- if (shape == null) {
+ if (shape == null)
return null;
- }
if (shape instanceof Line2D) {
Line2D pt = (Line2D) shape;
return rasterizeSegment(floorInt(pt.getX1()), floorInt(pt.getY1()), floorInt(pt.getX2()),
Modified: weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/SimpleTableModel.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/SimpleTableModel.java 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-core/weasis-core-ui/src/main/java/org/weasis/core/ui/util/SimpleTableModel.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -14,29 +14,10 @@
import org.weasis.core.ui.Messages;
-/**
- * <p>
- * Title: JMicroVision
- * </p>
- *
- * <p>
- * Description: ImageJai processing and analysis
- * </p>
- *
- * <p>
- * Copyright: Copyright (c) 2002 -2005
- * </p>
- *
- * <p>
- * Company:
- * </p>
- *
- * @author Nicolas Roduit
- * @version 1.2.2
- */
public class SimpleTableModel extends AbstractTableModel {
- private String[] columnNames = { Messages.getString("SimpleTableModel.param"), Messages.getString("SimpleTableModel.val") }; //$NON-NLS-1$ //$NON-NLS-2$
+ private String[] columnNames = {
+ Messages.getString("SimpleTableModel.param"), Messages.getString("SimpleTableModel.val") }; //$NON-NLS-1$ //$NON-NLS-2$
private Object[][] data = {};
private final boolean editable;
@@ -54,10 +35,12 @@
this.editable = editable;
}
+ @Override
public int getColumnCount() {
return columnNames.length;
}
+ @Override
public int getRowCount() {
return data.length;
}
@@ -72,6 +55,7 @@
return editable;
}
+ @Override
public Object getValueAt(int row, int col) {
return data[row][col];
}
Added: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/pref/DicomPrefFactory.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/pref/DicomPrefFactory.java (rev 0)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/pref/DicomPrefFactory.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -0,0 +1,15 @@
+package org.weasis.dicom.codec.pref;
+
+import java.util.Hashtable;
+
+import org.weasis.core.api.gui.PreferencesPageFactory;
+import org.weasis.core.api.gui.util.AbstractItemDialogPage;
+
+public class DicomPrefFactory implements PreferencesPageFactory {
+
+ @Override
+ public AbstractItemDialogPage createPreferencesPage(Hashtable<String, Object> properties) {
+ return new DicomPrefView();
+ }
+
+}
\ No newline at end of file
Property changes on: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/pref/DicomPrefFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/resources/OSGI-INF/Preferences.xml
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/resources/OSGI-INF/Preferences.xml 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/resources/OSGI-INF/Preferences.xml 2011-07-17 20:52:56 UTC (rev 15688)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.weasis.dicom.codec.pref.DicomPrefView">
- <implementation class="org.weasis.dicom.codec.pref.DicomPrefView"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.weasis.dicom.codec.pref.DicomPrefFactory">
+ <implementation class="org.weasis.dicom.codec.pref.DicomPrefFactory"/>
<service>
- <provide interface="org.weasis.core.api.gui.util.PageProps"/>
+ <provide interface="org.weasis.core.api.gui.PreferencesPageFactory"/>
</service>
</scr:component>
Added: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/pref/WadoPrefFactory.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/pref/WadoPrefFactory.java (rev 0)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/pref/WadoPrefFactory.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -0,0 +1,15 @@
+package org.weasis.dicom.explorer.pref;
+
+import java.util.Hashtable;
+
+import org.weasis.core.api.gui.PreferencesPageFactory;
+import org.weasis.core.api.gui.util.AbstractItemDialogPage;
+
+public class WadoPrefFactory implements PreferencesPageFactory {
+
+ @Override
+ public AbstractItemDialogPage createPreferencesPage(Hashtable<String, Object> properties) {
+ return new WadoPrefView();
+ }
+
+}
\ No newline at end of file
Property changes on: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/pref/WadoPrefFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/resources/OSGI-INF/Preferences.xml
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/resources/OSGI-INF/Preferences.xml 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/resources/OSGI-INF/Preferences.xml 2011-07-17 20:52:56 UTC (rev 15688)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.weasis.dicom.explorer.pref.WadoPrefView">
- <implementation class="org.weasis.dicom.explorer.pref.WadoPrefView"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.weasis.dicom.explorer.pref.WadoPrefFactory">
+ <implementation class="org.weasis.dicom.explorer.pref.WadoPrefFactory"/>
<service>
- <provide interface="org.weasis.core.api.gui.util.PageProps"/>
+ <provide interface="org.weasis.core.api.gui.PreferencesPageFactory"/>
</service>
</scr:component>
Added: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/ViewerPrefFactory.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/ViewerPrefFactory.java (rev 0)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/ViewerPrefFactory.java 2011-07-17 20:52:56 UTC (rev 15688)
@@ -0,0 +1,15 @@
+package org.weasis.dicom.viewer2d;
+
+import java.util.Hashtable;
+
+import org.weasis.core.api.gui.PreferencesPageFactory;
+import org.weasis.core.api.gui.util.AbstractItemDialogPage;
+
+public class ViewerPrefFactory implements PreferencesPageFactory {
+
+ @Override
+ public AbstractItemDialogPage createPreferencesPage(Hashtable<String, Object> properties) {
+ return new ViewerPrefView();
+ }
+
+}
Property changes on: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/ViewerPrefFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/resources/OSGI-INF/Preferences.xml
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/resources/OSGI-INF/Preferences.xml 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-viewer2d/src/main/resources/OSGI-INF/Preferences.xml 2011-07-17 20:52:56 UTC (rev 15688)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.weasis.dicom.viewer2d.ViewerPrefView">
- <implementation class="org.weasis.dicom.viewer2d.ViewerPrefView"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.weasis.dicom.viewer2d.ViewerPrefFactory">
+ <implementation class="org.weasis.dicom.viewer2d.ViewerPrefFactory"/>
<service>
- <provide interface="org.weasis.core.api.gui.util.PageProps"/>
+ <provide interface="org.weasis.core.api.gui.PreferencesPageFactory"/>
</service>
</scr:component>
Modified: weasis/weasis_framework/trunk/weasis-parent/pom.xml
===================================================================
--- weasis/weasis_framework/trunk/weasis-parent/pom.xml 2011-07-15 15:43:49 UTC (rev 15687)
+++ weasis/weasis_framework/trunk/weasis-parent/pom.xml 2011-07-17 20:52:56 UTC (rev 15688)
@@ -51,12 +51,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3.5</version>
<extensions>true</extensions>
<configuration>
<obrRepository>${settings.localRepository}/repository.xml</obrRepository>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
