Warning: Can't synchronize with repository "(default)" (/home/git/ome.git does not appear to be a Git repository.). Look in the Trac log for more information.
Ticket #12121: 0007-specification-Add-Editable-ROI-enum.patch
File 0007-specification-Add-Editable-ROI-enum.patch,
5.0 KB
(added by rleigh, 10 years ago) |
|
-
From f806003732d614e2bfd06c061816af9acd9deddf Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Sat, 19 Apr 2014 12:22:49 +0100
Subject: [PATCH 7/7] specification: Add Editable ROI enum
---
.../src/loci/formats/meta/MetadataConverter.java | 32 +++++++++++-----------
.../released-schema/2013-10-dev-2/ROI.xsd | 12 ++++++--
2 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/components/formats-api/src/loci/formats/meta/MetadataConverter.java b/components/formats-api/src/loci/formats/meta/MetadataConverter.java
index c44c344..ef2ce81 100644
a
|
b
|
public final class MetadataConverter { |
2292 | 2292 | catch (NullPointerException e) { } |
2293 | 2293 | |
2294 | 2294 | try { |
2295 | | Boolean locked = src.getEllipseLocked(i, q); |
2296 | | dest.setEllipseLocked(locked, i, q); |
| 2295 | Editable editable = src.getEllipseEditable(i, q); |
| 2296 | dest.setEllipseEditable(editable, i, q); |
2297 | 2297 | } |
2298 | 2298 | catch (NullPointerException e) { } |
2299 | 2299 | |
… |
… |
public final class MetadataConverter { |
2421 | 2421 | catch (NullPointerException e) { } |
2422 | 2422 | |
2423 | 2423 | try { |
2424 | | Boolean locked = src.getLabelLocked(i, q); |
2425 | | dest.setLabelLocked(locked, i, q); |
| 2424 | Editable editable = src.getLabelEditable(i, q); |
| 2425 | dest.setLabelEditable(editable, i, q); |
2426 | 2426 | } |
2427 | 2427 | catch (NullPointerException e) { } |
2428 | 2428 | |
… |
… |
public final class MetadataConverter { |
2538 | 2538 | catch (NullPointerException e) { } |
2539 | 2539 | |
2540 | 2540 | try { |
2541 | | Boolean locked = src.getLineLocked(i, q); |
2542 | | dest.setLineLocked(locked, i, q); |
| 2541 | Editable editable = src.getLineEditable(i, q); |
| 2542 | dest.setLineEditable(editable, i, q); |
2543 | 2543 | } |
2544 | 2544 | catch (NullPointerException e) { } |
2545 | 2545 | |
… |
… |
public final class MetadataConverter { |
2679 | 2679 | catch (NullPointerException e) { } |
2680 | 2680 | |
2681 | 2681 | try { |
2682 | | Boolean locked = src.getMaskLocked(i, q); |
2683 | | dest.setMaskLocked(locked, i, q); |
| 2682 | Editable editable = src.getMaskEditable(i, q); |
| 2683 | dest.setMaskEditable(editable, i, q); |
2684 | 2684 | } |
2685 | 2685 | catch (NullPointerException e) { } |
2686 | 2686 | |
… |
… |
public final class MetadataConverter { |
2808 | 2808 | catch (NullPointerException e) { } |
2809 | 2809 | |
2810 | 2810 | try { |
2811 | | Boolean locked = src.getPointLocked(i, q); |
2812 | | dest.setPointLocked(locked, i, q); |
| 2811 | Editable editable = src.getPointEditable(i, q); |
| 2812 | dest.setPointEditable(editable, i, q); |
2813 | 2813 | } |
2814 | 2814 | catch (NullPointerException e) { } |
2815 | 2815 | |
… |
… |
public final class MetadataConverter { |
2925 | 2925 | catch (NullPointerException e) { } |
2926 | 2926 | |
2927 | 2927 | try { |
2928 | | Boolean locked = src.getPolygonLocked(i, q); |
2929 | | dest.setPolygonLocked(locked, i, q); |
| 2928 | Editable editable = src.getPolygonEditable(i, q); |
| 2929 | dest.setPolygonEditable(editable, i, q); |
2930 | 2930 | } |
2931 | 2931 | catch (NullPointerException e) { } |
2932 | 2932 | |
… |
… |
public final class MetadataConverter { |
3036 | 3036 | catch (NullPointerException e) { } |
3037 | 3037 | |
3038 | 3038 | try { |
3039 | | Boolean locked = src.getPolylineLocked(i, q); |
3040 | | dest.setPolylineLocked(locked, i, q); |
| 3039 | Editable editable = src.getPolylineEditable(i, q); |
| 3040 | dest.setPolylineEditable(editable, i, q); |
3041 | 3041 | } |
3042 | 3042 | catch (NullPointerException e) { } |
3043 | 3043 | |
… |
… |
public final class MetadataConverter { |
3159 | 3159 | catch (NullPointerException e) { } |
3160 | 3160 | |
3161 | 3161 | try { |
3162 | | Boolean locked = src.getRectangleLocked(i, q); |
3163 | | dest.setRectangleLocked(locked, i, q); |
| 3162 | Editable editable = src.getRectangleEditable(i, q); |
| 3163 | dest.setRectangleEditable(editable, i, q); |
3164 | 3164 | } |
3165 | 3165 | catch (NullPointerException e) { } |
3166 | 3166 | |
-
diff --git a/components/specification/released-schema/2013-10-dev-2/ROI.xsd b/components/specification/released-schema/2013-10-dev-2/ROI.xsd
index ed7160c..f194b40 100644
a
|
b
|
|
241 | 241 | </xsd:simpleType> |
242 | 242 | </xsd:attribute> |
243 | 243 | |
244 | | <xsd:attribute name="Locked" use="optional" type="xsd:boolean"> |
| 244 | <xsd:attribute name="Editable" use="optional"> |
245 | 245 | <xsd:annotation> |
246 | 246 | <xsd:documentation> |
247 | | Controls whether the shape is locked and read only, |
248 | | true is locked, false is editable. |
| 247 | Controls whether the shape is editable, |
| 248 | ReadOnly is locked and read-only, ReadWrite is unlocked and editable. |
249 | 249 | </xsd:documentation> |
250 | 250 | </xsd:annotation> |
| 251 | <xsd:simpleType> |
| 252 | <xsd:restriction base="xsd:string"> |
| 253 | <xsd:enumeration value="ReadOnly"/> |
| 254 | <xsd:enumeration value="ReadWrite"/> |
| 255 | </xsd:restriction> |
| 256 | </xsd:simpleType> |
251 | 257 | </xsd:attribute> |
252 | 258 | |
253 | 259 | |
Download in other formats:
1.3.13-PRO © 2008-2011
Agilo Software all
rights reserved
(this page was served in: 0.16653 sec.)