Skip to content

Commit 0cd4efd

Browse files
gab1onegab1one
committed
Restore deprecated nodes, as buddy classloading is no longer available
1 parent 52117bb commit 0cd4efd

11 files changed

Lines changed: 42 additions & 30 deletions

File tree

‎org.knime.knip.base/src/org/knime/knip/base/nodes/filter/FilterNodeSetFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public Collection<String> getNodeFactoryIds() {
125125
m_nodeFactories.put(MaxFilterNodeFactory.class.getCanonicalName(), "/community/knip/image/filters");
126126
m_nodeFactories.put(AverageFilterNodeFactory.class.getCanonicalName(), "/community/knip/image/filters");
127127
m_nodeFactories.put(VarianceFilterNodeFactory.class.getCanonicalName(), "/community/knip/image/filters");
128-
// m_nodeFactories.put(GaussNativeTypeNodeFactory.class.getCanonicalName(), "/community/knip/image/filters");
128+
m_nodeFactories.put(GaussNativeTypeNodeFactory.class.getCanonicalName(), "/community/knip/image/filters");
129129
m_nodeFactories.put(GaussNativeTypeNodeFactory2.class.getCanonicalName(), "/community/knip/image/filters");
130130
m_nodeFactories.put(SobelNodeFactory.class.getCanonicalName(), "/community/knip/image/filters");
131131
m_nodeFactories.put(QuantileFilterNodeFactory.class.getCanonicalName(), "/community/knip/image/filters");

‎org.knime.knip.base/src/org/knime/knip/base/nodes/knimeimagebridge/ConversionNodeSetFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ public Class<? extends NodeFactory<? extends NodeModel>> getNodeFactory(final St
110110
@Override
111111
public Collection<String> getNodeFactoryIds() {
112112

113+
m_nodeFactories.put(PNGValueToImgPlusCellNodeFactory.class.getCanonicalName(), "/community/knip/image");
113114
m_nodeFactories.put(PNGValueToImgPlusCell2NodeFactory.class.getCanonicalName(), "/community/knip/image");
114-
115115
m_nodeFactories.put(ImgPlusCellToPNGValueNodeFactory.class.getCanonicalName(), "/community/knip/image");
116116

117117
return m_nodeFactories.keySet();

‎org.knime.knip.base/src/org/knime/knip/base/nodes/knimeimagebridge/ImgPlusCellToPNGValueNodeFactory.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE knimeNode PUBLIC "-//UNIKN//DTD KNIME Node 2.0//EN" "http://www.knime.org/Node.dtd">
2-
<knimeNode icon="ImgToPng.png" type="Manipulator">
2+
<knimeNode icon="ImgToPng.png" type="Manipulator" deprecated="true">
33
<name> ImgPlus to PNG Images </name>
44

55
<shortDescription>

‎org.knime.knip.base/src/org/knime/knip/base/nodes/misc/splitter/SplitterNodeFactory.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
* @author <a href="mailto:horn_martin@gmx.de">Martin Horn</a>
6161
* @author <a href="mailto:michael.zinsmaier@googlemail.com">Michael Zinsmaier</a>
6262
*/
63+
@Deprecated
6364
public class SplitterNodeFactory extends NodeFactory<SplitterNodeModel> {
6465

6566
/**

‎org.knime.knip.base/src/org/knime/knip/base/nodes/proc/ProcNodeSetFactory.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,14 @@
5959
import org.knime.knip.base.nodes.misc.dimswap.DimensionSwapperNodeFactory;
6060
import org.knime.knip.base.nodes.misc.merger.MergerNodeFactory;
6161
import org.knime.knip.base.nodes.misc.splitter.Splitter2NodeFactory;
62+
import org.knime.knip.base.nodes.misc.splitter.SplitterNodeFactory;
6263
import org.knime.knip.base.nodes.misc.splitter.UCSplitterNodeFactory;
6364
import org.knime.knip.base.nodes.orientationj.measure.OrientationJMeasurementNodeFactory;
6465
import org.knime.knip.base.nodes.proc.binner.IntensityBinnerNodeFactory;
6566
import org.knime.knip.base.nodes.proc.clahe.ClaheNodeFactory;
67+
import org.knime.knip.base.nodes.proc.dogdetector.DoGDetector2NodeFactory;
6668
import org.knime.knip.base.nodes.proc.dogdetector.DoGDetector3NodeFactory;
69+
import org.knime.knip.base.nodes.proc.dogdetector.DoGDetectorNodeFactory;
6770
import org.knime.knip.base.nodes.proc.imgjep.ImgJEPNodeFactory;
6871
import org.knime.knip.base.nodes.proc.maxfinder.MaximumFinderNodeFactory;
6972
import org.knime.knip.base.nodes.proc.multilvlthresholding.MultilevelThresholderNodeFactory;
@@ -72,6 +75,7 @@
7275
import org.knime.knip.base.nodes.proc.spotdetection.WaveletSpotDetectionNodeFactory;
7376
import org.knime.knip.base.nodes.proc.thinning.ThinningNodeFactory;
7477
import org.knime.knip.base.nodes.proc.ucm.UCMNodeFactory;
78+
import org.knime.knip.base.nodes.seg.local.LocalThresholderNodeFactory;
7579
import org.knime.knip.base.nodes.seg.local.LocalThresholderNodeFactory2;
7680

7781
/**
@@ -126,9 +130,10 @@ public Class<? extends NodeFactory<? extends NodeModel>> getNodeFactory(final St
126130
*/
127131
@Override
128132
public Collection<String> getNodeFactoryIds() {
133+
m_nodeFactories.put(LocalThresholderNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
129134
m_nodeFactories.put(LocalThresholderNodeFactory2.class.getCanonicalName(), "/community/knip/image/process");
130135
m_nodeFactories.put(MultilevelThresholderNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
131-
// m_nodeFactories.put(AlignerNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
136+
m_nodeFactories.put(AlignerNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
132137
m_nodeFactories.put(ThinningNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
133138
m_nodeFactories.put(ImgJEPNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
134139
m_nodeFactories.put(ConvertImgNodeFactory.class.getCanonicalName(), "/community/knip/image");
@@ -141,9 +146,10 @@ public Collection<String> getNodeFactoryIds() {
141146
m_nodeFactories.put(LabelingResizerNodeFactory.class.getCanonicalName(), "/community/knip/image");
142147
m_nodeFactories.put(UCSplitterNodeFactory.class.getCanonicalName(), "/community/knip/image");
143148
m_nodeFactories.put(DimensionSwapperNodeFactory.class.getCanonicalName(), "/community/knip/image");
149+
m_nodeFactories.put(SplitterNodeFactory.class.getCanonicalName(), "/community/knip/image");
144150
m_nodeFactories.put(Splitter2NodeFactory.class.getCanonicalName(), "/community/knip/image");
145151
m_nodeFactories.put(MergerNodeFactory.class.getCanonicalName(), "/community/knip/image");
146-
// m_nodeFactories.put(ImgCropperNodeFactory.class.getCanonicalName(), "/community/knip/image");
152+
m_nodeFactories.put(ImgCropperNodeFactory.class.getCanonicalName(), "/community/knip/image");
147153
m_nodeFactories.put(AutoCropNodeFactory.class.getCanonicalName(), "/community/knip/image");
148154

149155
m_nodeFactories.put(GrayscaleReconstructionNodeFactory.class.getCanonicalName(),
@@ -159,15 +165,18 @@ public Collection<String> getNodeFactoryIds() {
159165

160166
// ROI based nodes (which deprecated the old implementations)
161167
m_nodeFactories.put(ImgNormalizerNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
168+
m_nodeFactories.put(InvertNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
162169
m_nodeFactories.put(InverterNodeFactory2.class.getCanonicalName(), "/community/knip/image/process");
170+
m_nodeFactories.put(ThresholderNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
171+
m_nodeFactories.put(ThresholderNodeFactory2.class.getCanonicalName(), "/community/knip/image/process");
163172
m_nodeFactories.put(ThresholderNodeFactory3.class.getCanonicalName(), "/community/knip/image/process");
164173

165174
// Deprecated ClaheNodeFactory
166175
m_nodeFactories.put(ClaheNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
167176

168177
// DoG Detection
169-
// m_nodeFactories.put(DoGDetectorNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
170-
// m_nodeFactories.put(DoGDetector2NodeFactory.class.getCanonicalName(), "/community/knip/image/process");
178+
m_nodeFactories.put(DoGDetectorNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
179+
m_nodeFactories.put(DoGDetector2NodeFactory.class.getCanonicalName(), "/community/knip/image/process");
171180
m_nodeFactories.put(DoGDetector3NodeFactory.class.getCanonicalName(), "/community/knip/image/process");
172181

173182
// new version
@@ -178,7 +187,8 @@ public Collection<String> getNodeFactoryIds() {
178187

179188
m_nodeFactories.put(IntensityBinnerNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
180189

181-
m_nodeFactories.put(OrientationJMeasurementNodeFactory.class.getCanonicalName(), "/community/knip/image/process");
190+
m_nodeFactories.put(OrientationJMeasurementNodeFactory.class.getCanonicalName(),
191+
"/community/knip/image/process");
182192

183193
return m_nodeFactories.keySet();
184194
}

‎org.knime.knip.base/src/org/knime/knip/base/nodes/proc/ThresholderNodeFactory.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
and is available at http://www.eclipse.org/legal/epl-v10.html Contributors:
55
IBM Corporation - initial API and implementation -->
66
<!DOCTYPE knimeNode PUBLIC "-//UNIKN//DTD KNIME Node 2.0//EN" "http://www.knime.org/Node.dtd">
7-
<knimeNode icon="icons/thresholder.png" type="Manipulator">
7+
<knimeNode icon="icons/thresholder.png" type="Manipulator" deprecated="true">
88
<name>Global Thresholder (deprecated)</name>
99
<shortDescription>
1010
A threshold is determined manually or calculated

‎org.knime.knip.base/src/org/knime/knip/base/nodes/seg/LabNodeSetFactory.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,13 @@
5959
import org.knime.knip.base.nodes.io.seeds.SeedGeneratorNodeFactory;
6060
import org.knime.knip.base.nodes.misc.LabToStringLabNodeFactory;
6161
import org.knime.knip.base.nodes.misc.LabelingToRGBImgNodeFactory;
62+
import org.knime.knip.base.nodes.seg.cellclumpedsplitter.CellClumpedSplitterNodeFactory;
6263
import org.knime.knip.base.nodes.seg.colormanager.ApplyColorSettingsToLabelsNodeFactory;
6364
import org.knime.knip.base.nodes.seg.compare.CompareSegmentsNodeFactory;
65+
import org.knime.knip.base.nodes.seg.contourdetectwithseeds.ContourDetectorNodeFactory;
6466
import org.knime.knip.base.nodes.seg.cropper.SegmentCropperNodeFactory;
6567
import org.knime.knip.base.nodes.seg.graphcuts.GraphCutNodeFactory;
68+
import org.knime.knip.base.nodes.seg.lab2table.Lab2TableNodeFactory;
6669
import org.knime.knip.base.nodes.seg.labeleditor.LabelTransformerNodeFactory;
6770
import org.knime.knip.base.nodes.seg.labeltopng.LabelingToPNGValueNodeFactory;
6871
import org.knime.knip.base.nodes.seg.morphops.MorphLabelingOpsNodeFactory;
@@ -127,17 +130,17 @@ public Collection<String> getNodeFactoryIds() {
127130
m_nodeFactories.put(LabelingToImgNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
128131
m_nodeFactories.put(WatershedNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
129132
m_nodeFactories.put(ConvertLabelingNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
130-
// m_nodeFactories.put(EdgeObjectsExcluderNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
133+
// m_nodeFactories.put(EdgeObjectsExcluderNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
131134
m_nodeFactories.put(ExtractOutlineLabelingNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
132-
// m_nodeFactories.put(LabelingOrthoCropperNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
135+
m_nodeFactories.put(LabelingOrthoCropperNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
133136
m_nodeFactories.put(VoronoiSegNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
134137
m_nodeFactories.put(GraphCutNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
135138
m_nodeFactories.put(SegmentCropperNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
136-
// m_nodeFactories.put(Lab2TableNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
139+
m_nodeFactories.put(Lab2TableNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
137140
m_nodeFactories.put(GraphCutNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
138141
m_nodeFactories.put(MorphLabelingOpsNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
139-
// m_nodeFactories.put(ContourDetectorNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
140-
// m_nodeFactories.put(CellClumpedSplitterNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
142+
m_nodeFactories.put(ContourDetectorNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
143+
m_nodeFactories.put(CellClumpedSplitterNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
141144
m_nodeFactories.put(SeedGeneratorNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
142145
m_nodeFactories.put(LabelingToRGBImgNodeFactory.class.getCanonicalName(), "/community/knip/labeling");
143146
m_nodeFactories.put(LabToStringLabNodeFactory.class.getCanonicalName(), "/community/knip/labeling");

‎org.knime.knip.io/src/org/knime/knip/io/nodes/IONodeSetFactory.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import org.knime.knip.io.nodes.annotation.edit.LabelingEditorNodeFactory;
6161
import org.knime.knip.io.nodes.fileref.ImageFileRefNodeFactory;
6262
import org.knime.knip.io.nodes.imgimporter.ImgImporterNodeFactory;
63+
import org.knime.knip.io.nodes.imgreader.ImgReaderNodeFactory;
6364
import org.knime.knip.io.nodes.imgreader2.readfromdialog.ImgReader2NodeFactory;
6465
import org.knime.knip.io.nodes.imgreader2.readfrominput.ImgReaderTableNodeFactory;
6566
import org.knime.knip.io.nodes.imgwriter2.ImgWriter2NodeFactory;
@@ -119,8 +120,9 @@ public Class<? extends NodeFactory<? extends NodeModel>> getNodeFactory(final St
119120
*/
120121
@Override
121122
public Collection<String> getNodeFactoryIds() {
122-
// m_nodeFactories.put(ImgReaderNodeFactory.class.getCanonicalName(),
123-
// "/community/knip/io");
123+
m_nodeFactories.put(org.knime.knip.base.nodes.io.imgreader.ImgReaderNodeFactory.class.getCanonicalName(),
124+
"/community/knip/io");
125+
m_nodeFactories.put(ImgReaderNodeFactory.class.getCanonicalName(), "/community/knip/io");
124126
m_nodeFactories.put(ImgWriter2NodeFactory.class.getCanonicalName(), "/community/knip/io");
125127
m_nodeFactories.put(ImgImporterNodeFactory.class.getCanonicalName(), "/community/knip/io/other");
126128
m_nodeFactories.put(OverlayAnnotatorNodeFactory.class.getCanonicalName(), "/community/knip/labeling");

‎org.knime.knip.testing/plugin.xml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<?eclipse version="3.0"?>
33

44
<plugin>
5-
<extension point="org.knime.workbench.repository.nodes">
6-
</extension>
75
<extension point="org.knime.workbench.repository.categories">
86
<category
97
description="KNIME Image Processing Testing Nodes"
@@ -16,17 +14,14 @@
1614
<extension
1715
point="org.knime.workbench.repository.nodesets">
1816
<nodeset
19-
expert-flag="false"
20-
factory-class="org.knime.knip.base.nodes.testing.TestingNodeSetFactory"
21-
id="org.knime.knip.base.nodes.testing.TestingNodeSetFactory">
17+
deprecated="true"
18+
factory-class="org.knime.knip.base.nodes.testing.TableCellViewer.TestViewsNodeSetFactory"
19+
id="org.knime.knip.base.nodes.testing.TableCellViewer.TestViewsNodeSetFactory">
2220
</nodeset>
23-
</extension>
24-
<extension
25-
point="org.knime.workbench.repository.nodesets">
2621
<nodeset
27-
expert-flag="false"
28-
factory-class="org.knime.knip.base.nodes.testing.TableCellViewer.TestViewsNodeSetFactory"
29-
id="org.knime.knip.testing.nodeset1">
22+
deprecated="false"
23+
factory-class="org.knime.knip.base.nodes.testing.TestingNodeSetFactory"
24+
id="org.knime.knip.base.nodes.testing.TestingNodeSetFactory">
3025
</nodeset>
31-
</extension>
26+
</extension>
3227
</plugin>

‎org.knime.knip.testing/src/org/knime/knip/base/nodes/testing/TableCellViewer/TestTableCellViewNodeFactory.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
IBM Corporation - initial API and implementation -->
77

88
<!DOCTYPE knimeNode PUBLIC "-//UNIKN//DTD KNIME Node 2.0//EN" "http://www.knime.org/Node.dtd">
9-
<knimeNode icon="tablecellviewer.png" type="Visualizer">
9+
<knimeNode icon="tablecellviewer.png" type="Visualizer" deprecated="true">
1010
<name>Table Cell Test Viewer</name>
1111
<shortDescription>Test viewer useful for automated testing.</shortDescription>
1212

0 commit comments

Comments
 (0)