Skip to content

Commit bb56635

Browse files
author
Gabriel Einsdorf
committed
Codestyle cleanups
1 parent 2bdc895 commit bb56635

3 files changed

Lines changed: 31 additions & 50 deletions

File tree

‎org.knime.knip.base/src/org/knime/knip/base/data/img/ImgPlusCell.java‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,13 @@
6565
import org.knime.core.data.filestore.FileStoreCell;
6666
import org.knime.knip.base.KNIMEKNIPPlugin;
6767
import org.knime.knip.base.data.CachedObjectAccess;
68-
import org.knime.knip.base.data.CachedObjectAccess.StreamSkipper;
6968
import org.knime.knip.base.data.FileStoreCellMetadata;
7069
import org.knime.knip.base.data.IntervalValue;
7170
import org.knime.knip.base.renderer.ThumbnailRenderer;
7271
import org.knime.knip.core.KNIPGateway;
7372
import org.knime.knip.core.awt.AWTImageTools;
7473
import org.knime.knip.core.awt.Real2GreyColorRenderer;
7574
import org.knime.knip.core.data.img.DefaultImgMetadata;
76-
import org.knime.knip.core.io.externalization.BufferedDataInputStream;
7775
import org.knime.knip.core.io.externalization.ExternalizerManager;
7876
import org.knime.knip.core.util.MinimaUtils;
7977
import org.scijava.Named;
@@ -160,12 +158,12 @@ protected ImgPlusCell(final Img<T> img, final ImgPlusMetadata metadata, final Fi
160158
tmpImg = ((WrappedImg<T>)tmpImg).getImg();
161159
}
162160

163-
m_imgAccess = new CachedObjectAccess<Img<T>>(fileStore, tmpImg);
161+
m_imgAccess = new CachedObjectAccess<>(fileStore, tmpImg);
164162

165163
final long[] dimensions = new long[img.numDimensions()];
166164
img.dimensions(dimensions);
167165

168-
m_metadataAccess = new CachedObjectAccess<ImgPlusCellMetadata>(fileStore,
166+
m_metadataAccess = new CachedObjectAccess<>(fileStore,
169167
new ImgPlusCellMetadata(
170168
MetadataUtil.copyImgPlusMetadata(metadata, new DefaultImgMetadata(dimensions.length)),
171169
img.size(), getMinFromImg(img), dimensions, img.firstElement().getClass(), null));
@@ -317,7 +315,7 @@ public synchronized ImgPlus<T> getImgPlus() {
317315
@Override
318316
public synchronized ImgPlus<T> getImgPlusCopy() {
319317
final ImgPlus<T> source = getImgPlus();
320-
final ImgPlus<T> dest = new ImgPlus<T>(source.copy());
318+
final ImgPlus<T> dest = new ImgPlus<>(source.copy());
321319

322320
MetadataUtil.copyImgPlusMetadata(source, dest);
323321

@@ -530,28 +528,20 @@ protected synchronized void load(final DataInput input) throws IOException {
530528
protected void postConstruct() {
531529

532530
@SuppressWarnings("unchecked")
533-
final ImgPlusCell<T> tmp = (ImgPlusCell<T>)CACHE.get(this);
531+
final ImgPlusCell<T> tmp = (ImgPlusCell<T>)CACHE.get(this.stringHashCode());
534532

535533
if (tmp == null) {
536-
m_metadataAccess =
537-
new CachedObjectAccess<ImgPlusCellMetadata>(getFileStore(), null, m_fileMetadata.getOffset(), null);
538-
539-
m_imgAccess = new CachedObjectAccess<Img<T>>(getFileStore(), null, m_fileMetadata.getOffset(),
540-
new StreamSkipper() {
541-
/**
542-
* {@inheritDoc}
543-
*/
544-
@Override
545-
public void skip(final BufferedDataInputStream in) {
546-
try {
547-
m_metadataAccess.setObject(ExternalizerManager.read(in));
548-
} catch (Exception e) {
549-
throw new RuntimeException(e);
550-
}
551-
}
552-
});
553-
554-
CACHE.put(this, this);
534+
m_metadataAccess = new CachedObjectAccess<>(getFileStore(), null, m_fileMetadata.getOffset(), null);
535+
536+
m_imgAccess = new CachedObjectAccess<>(getFileStore(), null, m_fileMetadata.getOffset(), in -> {
537+
try {
538+
m_metadataAccess.setObject(ExternalizerManager.read(in));
539+
} catch (Exception e) {
540+
throw new RuntimeException(e);
541+
}
542+
});
543+
544+
CACHE.put(this.stringHashCode(), this);
555545
} else {
556546
m_metadataAccess = tmp.m_metadataAccess;
557547
m_imgAccess = tmp.m_imgAccess;

‎org.knime.knip.base/src/org/knime/knip/base/data/labeling/LabelingCell.java‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import org.knime.core.data.filestore.FileStoreCell;
6565
import org.knime.knip.base.KNIMEKNIPPlugin;
6666
import org.knime.knip.base.data.CachedObjectAccess;
67-
import org.knime.knip.base.data.CachedObjectAccess.StreamSkipper;
6867
import org.knime.knip.base.data.FileStoreCellMetadata;
6968
import org.knime.knip.base.data.IntervalValue;
7069
import org.knime.knip.base.renderer.ThumbnailRenderer;
@@ -75,7 +74,6 @@
7574
import org.knime.knip.core.awt.labelingcolortable.RandomMissingColorHandler;
7675
import org.knime.knip.core.data.LabelingView;
7776
import org.knime.knip.core.data.img.LabelingMetadata;
78-
import org.knime.knip.core.io.externalization.BufferedDataInputStream;
7977
import org.knime.knip.core.io.externalization.ExternalizerManager;
8078
import org.scijava.Named;
8179
import org.scijava.cache.CacheService;
@@ -156,9 +154,9 @@ protected LabelingCell(final RandomAccessibleInterval<LabelingType<L>> labeling,
156154
super(fileStore);
157155
final long[] dimensions = new long[labeling.numDimensions()];
158156
labeling.dimensions(dimensions);
159-
m_metadataAccess = new CachedObjectAccess<LabelingCellMetadata>(fileStore,
157+
m_metadataAccess = new CachedObjectAccess<>(fileStore,
160158
new LabelingCellMetadata(metadata, Views.iterable(labeling).size(), dimensions, null));
161-
m_labelingAccess = new CachedObjectAccess<>(fileStore, new LabelingView<L>(labeling));
159+
m_labelingAccess = new CachedObjectAccess<>(fileStore, new LabelingView<>(labeling));
162160
m_fileMetadata = new FileStoreCellMetadata(-1, false, null);
163161

164162
CACHE.put(this.stringHashCode(), this);
@@ -365,7 +363,7 @@ public synchronized Image getThumbnail(final RenderingHints renderingHints) {
365363
fullHeight = tmp.getDimensions()[1];
366364
}
367365
if ((tmp.getThumbnail() == null) || (tmp.getThumbnail().getHeight() != height)) {
368-
m_metadataAccess = new CachedObjectAccess<LabelingCellMetadata>(getFileStore(),
366+
m_metadataAccess = new CachedObjectAccess<>(getFileStore(),
369367
tmp = new LabelingCellMetadata(tmp.getLabelingMetadata(), tmp.getSize(), tmp.getDimensions(),
370368
createThumbnail(height / fullHeight)));
371369
// update cached object
@@ -428,27 +426,20 @@ protected synchronized void load(final DataInput input) throws IOException {
428426
protected void postConstruct() {
429427

430428
@SuppressWarnings("unchecked")
431-
final LabelingCell<L> tmp = (LabelingCell<L>)CACHE.get(this);
429+
final LabelingCell<L> tmp = (LabelingCell<L>)CACHE.get(this.stringHashCode());
432430

433431
if (tmp == null) {
434432
// Creates empty CachedObjectAccesses which know how to reconstruct the managed objects.
435433
m_metadataAccess = new CachedObjectAccess<>(getFileStore(), null, m_fileMetadata.getOffset(), null);
436-
m_labelingAccess =
437-
new CachedObjectAccess<>(getFileStore(), null, m_fileMetadata.getOffset(), new StreamSkipper() {
438-
/**
439-
* {@inheritDoc}
440-
*/
441-
@Override
442-
public void skip(final BufferedDataInputStream in) {
443-
try {
444-
m_metadataAccess.setObject(ExternalizerManager.read(in));
445-
} catch (Exception e) {
446-
throw new RuntimeException(e);
447-
}
448-
}
449-
});
450-
451-
CACHE.put(this, this);
434+
m_labelingAccess = new CachedObjectAccess<>(getFileStore(), null, m_fileMetadata.getOffset(), in -> {
435+
try {
436+
m_metadataAccess.setObject(ExternalizerManager.read(in));
437+
} catch (Exception e) {
438+
throw new RuntimeException(e);
439+
}
440+
});
441+
442+
CACHE.put(this.stringHashCode(), this);
452443
} else {
453444
m_labelingAccess = tmp.m_labelingAccess;
454445
m_metadataAccess = tmp.m_metadataAccess;

‎org.knime.knip.io/src/org/knime/knip/io/ImgRefCell.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public ImgPlus<T> getImgPlus() {
331331
*/
332332
@Override
333333
public ImgPlus<T> getImgPlusCopy() {
334-
return new ImgPlus<T>(getImgCopy(), getMetadata());
334+
return new ImgPlus<>(getImgCopy(), getMetadata());
335335
}
336336

337337
/**
@@ -351,14 +351,14 @@ public ImgPlusMetadata getMetadata() {
351351
}
352352
} catch (final Exception e) {
353353
noAccessWarning(e);
354-
tmpAxes = new ArrayList<CalibratedAxis>();
354+
tmpAxes = new ArrayList<>();
355355
for (int i = 0; i < getDimensions().length; i++) {
356356
tmpAxes.add(new DefaultLinearAxis(Axes.get("Unknown " + i)));
357357
}
358358
}
359359

360360
// setting everything to metadata
361-
final List<CalibratedAxis> axes = new ArrayList<CalibratedAxis>(tmpAxes);
361+
final List<CalibratedAxis> axes = new ArrayList<>(tmpAxes);
362362

363363
// TODO: Can be replaced by FinalMetadata?!
364364
return new ImgPlusMetadata() {

0 commit comments

Comments
 (0)