Changeset 5642


Ignore:
Timestamp:
10/28/09 11:55:55 (10 years ago)
Author:
callan
Message:
  • Fixed up some class hierarchy issues, now using "Enumeration" interface
  • Adding code generated handlers to Bio-Formats from XsdFu
Location:
trunk/components/bio-formats/src/loci/formats/enums
Files:
23 added
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/enums/AcquisitionMode.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum AcquisitionMode 
     41public enum AcquisitionMode implements Enumeration 
    4242{ 
    4343  WIDEFIELD("WideField"), LASERSCANNINGMICROSCOPY("LaserScanningMicroscopy"), LASERSCANNINGCONFOCAL("LaserScanningConfocal"), SPINNINGDISKCONFOCAL("SpinningDiskConfocal"), SLITSCANCONFOCAL("SlitScanConfocal"), MULTIPHOTONMICROSCOPY("MultiPhotonMicroscopy"), STRUCTUREDILLUMINATION("StructuredIllumination"), SINGLEMOLECULEIMAGING("SingleMoleculeImaging"), TOTALINTERNALREFLECTION("TotalInternalReflection"), FLUORESCENCELIFETIME("FluorescenceLifetime"), SPECTRALIMAGING("SpectralImaging"), FLUORESCENCECORRELATIONSPECTROSCOPY("FluorescenceCorrelationSpectroscopy"), NEARFIELDSCANNINGOPTICALMICROSCOPY("NearFieldScanningOpticalMicroscopy"), SECONDHARMONICGENERATIONIMAGING("SecondHarmonicGenerationImaging"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/ArcType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum ArcType 
     41public enum ArcType implements Enumeration 
    4242{ 
    4343  HG("Hg"), XE("Xe"), HGXE("HgXe"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/Binning.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum Binning 
     41public enum Binning implements Enumeration 
    4242{ 
    4343  ONEXONE("1x1"), TWOXTWO("2x2"), FOURXFOUR("4x4"), EIGHTXEIGHT("8x8"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/ContrastMethod.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum ContrastMethod 
     41public enum ContrastMethod implements Enumeration 
    4242{ 
    4343  BRIGHTFIELD("Brightfield"), PHASE("Phase"), DIC("DIC"), HOFFMANMODULATION("HoffmanModulation"), OBLIQUEILLUMINATION("ObliqueIllumination"), POLARIZEDLIGHT("PolarizedLight"), DARKFIELD("Darkfield"), FLUORESCENCE("Fluorescence"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/Correction.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum Correction 
     41public enum Correction implements Enumeration 
    4242{ 
    4343  UV("UV"), PLANAPO("PlanApo"), PLANFLUOR("PlanFluor"), SUPERFLUOR("SuperFluor"), VIOLETCORRECTED("VioletCorrected"), ACHRO("Achro"), ACHROMAT("Achromat"), FLUOR("Fluor"), FL("Fl"), FLUAR("Fluar"), NEOFLUAR("Neofluar"), FLUOTAR("Fluotar"), APO("Apo"), PLANNEOFLUAR("PlanNeofluar"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/DetectorType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum DetectorType 
     41public enum DetectorType implements Enumeration 
    4242{ 
    4343  CCD("CCD"), INTENSIFIEDCCD("IntensifiedCCD"), ANALOGVIDEO("AnalogVideo"), PMT("PMT"), PHOTODIODE("Photodiode"), SPECTROSCOPY("Spectroscopy"), LIFETIMEIMAGING("LifetimeImaging"), CORRELATIONSPECTROSCOPY("CorrelationSpectroscopy"), FTIR("FTIR"), EMCCD("EMCCD"), APD("APD"), CMOS("CMOS"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/DimensionOrder.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum DimensionOrder 
     41public enum DimensionOrder implements Enumeration 
    4242{ 
    4343  XYZCT("XYZCT"), XYZTC("XYZTC"), XYCTZ("XYCTZ"), XYCZT("XYCZT"), XYTCZ("XYTCZ"), XYTZC("XYTZC"); 
  • trunk/components/bio-formats/src/loci/formats/enums/Enumeration.java

    r5630 r5642  
    3131 * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/enums/Enumeration.java">SVN</a></dd></dl> 
    3232 */ 
    33 public abstract class Enumeration { 
     33public interface Enumeration { 
    3434  // TODO 
    3535} 
  • trunk/components/bio-formats/src/loci/formats/enums/ExperimentType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum ExperimentType 
     41public enum ExperimentType implements Enumeration 
    4242{ 
    4343  FP("FP"), FRET("FRET"), TIMELAPSE("TimeLapse"), FOURDPLUS("FourDPlus"), SCREEN("Screen"), IMMUNOCYTOCHEMISTRY("Immunocytochemistry"), IMMUNOFLUORESCENCE("Immunofluorescence"), FISH("FISH"), ELECTROPHYSIOLOGY("Electrophysiology"), IONIMAGING("IonImaging"), COLOCALIZATION("Colocalization"), PGIDOCUMENTATION("PGIDocumentation"), FLUORESCENCELIFETIME("FluorescenceLifetime"), SPECTRALIMAGING("SpectralImaging"), PHOTOBLEACHING("Photobleaching"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/FilamentType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum FilamentType 
     41public enum FilamentType implements Enumeration 
    4242{ 
    4343  INCANDESCENT("Incandescent"), HALOGEN("Halogen"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/FilterType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum FilterType 
     41public enum FilterType implements Enumeration 
    4242{ 
    4343  LONGPASS("LongPass"), SHORTPASS("ShortPass"), BANDPASS("BandPass"), MULTIPASS("MultiPass"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/FontFamily.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum FontFamily 
     41public enum FontFamily implements Enumeration 
    4242{ 
    4343  ARIAL("Arial"), COURIER("Courier"), HELVETICA("Helvetica"), TIMESNEWROMAN("TimesNewRoman"); 
  • trunk/components/bio-formats/src/loci/formats/enums/FontStyle.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum FontStyle 
     41public enum FontStyle implements Enumeration 
    4242{ 
    4343  BOLD("Bold"), BOLDITALIC("BoldItalic"), ITALIC("Italic"), REGULAR("Regular"); 
  • trunk/components/bio-formats/src/loci/formats/enums/IlluminationType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum IlluminationType 
     41public enum IlluminationType implements Enumeration 
    4242{ 
    4343  TRANSMITTED("Transmitted"), EPIFLUORESCENCE("Epifluorescence"), OBLIQUE("Oblique"), NONLINEAR("NonLinear"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/Immersion.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum Immersion 
     41public enum Immersion implements Enumeration 
    4242{ 
    4343  OIL("Oil"), WATER("Water"), WATERDIPPING("WaterDipping"), AIR("Air"), MULTI("Multi"), GLYCEROL("Glycerol"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/LaserMedium.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum LaserMedium 
     41public enum LaserMedium implements Enumeration 
    4242{ 
    4343  CU("Cu"), AG("Ag"), ARFL("ArFl"), ARCL("ArCl"), KRFL("KrFl"), KRCL("KrCl"), XEFL("XeFl"), XECL("XeCl"), XEBR("XeBr"), N("N"), AR("Ar"), KR("Kr"), XE("Xe"), HENE("HeNe"), HECD("HeCd"), CO("CO"), CO2("CO2"), H2O("H2O"), HFL("HFl"), NDGLASS("NdGlass"), NDYAG("NdYAG"), ERGLASS("ErGlass"), ERYAG("ErYAG"), HOYLF("HoYLF"), HOYAG("HoYAG"), RUBY("Ruby"), TISAPPHIRE("TiSapphire"), ALEXANDRITE("Alexandrite"), RHODAMINE6G("Rhodamine6G"), COUMARINC30("CoumarinC30"), GAAS("GaAs"), GAALAS("GaAlAs"), EMINUS("EMinus"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/LaserType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum LaserType 
     41public enum LaserType implements Enumeration 
    4242{ 
    4343  EXCIMER("Excimer"), GAS("Gas"), METALVAPOR("MetalVapor"), SOLIDSTATE("SolidState"), DYE("Dye"), SEMICONDUCTOR("Semiconductor"), FREEELECTRON("FreeElectron"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/LineCap.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum LineCap 
     41public enum LineCap implements Enumeration 
    4242{ 
    4343  BUTT("Butt"), LINE("Line"), SQUARE("Square"); 
  • trunk/components/bio-formats/src/loci/formats/enums/Marker.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum Marker 
     41public enum Marker implements Enumeration 
    4242{ 
    4343  ARROW("Arrow"), CIRCLE("Circle"), SQUARE("Square"); 
  • trunk/components/bio-formats/src/loci/formats/enums/Medium.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum Medium 
     41public enum Medium implements Enumeration 
    4242{ 
    4343  AIR("Air"), OIL("Oil"), WATER("Water"), GLYCEROL("Glycerol"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/MicrobeamManipulationType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum MicrobeamManipulationType 
     41public enum MicrobeamManipulationType implements Enumeration 
    4242{ 
    4343  FRAP("FRAP"), PHOTOABLATION("Photoablation"), PHOTOACTIVATION("Photoactivation"), UNCAGING("Uncaging"), OPTICALTRAPPING("OpticalTrapping"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/MicroscopeType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum MicroscopeType 
     41public enum MicroscopeType implements Enumeration 
    4242{ 
    4343  UPRIGHT("Upright"), INVERTED("Inverted"), DISSECTION("Dissection"), ELECTROPHYSIOLOGY("Electrophysiology"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/NamingConvention.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum NamingConvention 
     41public enum NamingConvention implements Enumeration 
    4242{ 
    4343  LETTER("letter"), NUMBER("number"); 
  • trunk/components/bio-formats/src/loci/formats/enums/PixelType.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum PixelType 
     41public enum PixelType implements Enumeration 
    4242{ 
    4343  INT8("int8"), INT16("int16"), INT32("int32"), UINT8("uint8"), UINT16("uint16"), UINT32("uint32"), FLOAT("float"), BIT("bit"), DOUBLE("double"), COMPLEX("complex"), DOUBLECOMPLEX("double-complex"); 
  • trunk/components/bio-formats/src/loci/formats/enums/Pulse.java

    r5641 r5642  
    3232 * 
    3333 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    34  * Created by callan via xsd-fu on 2009-10-28 11:37:35+0000 
     34 * Created by callan via xsd-fu on 2009-10-28 16:41:25+0000 
    3535 * 
    3636 *----------------------------------------------------------------------------- 
     
    3939package loci.formats.enums; 
    4040 
    41 public enum Pulse 
     41public enum Pulse implements Enumeration 
    4242{ 
    4343  CW("CW"), SINGLE("Single"), QSWITCHED("QSwitched"), REPETITIVE("Repetitive"), MODELOCKED("ModeLocked"), OTHER("Other"); 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/CorrectionEnumHandler.java

    r5639 r5642  
    1 // 
    2 // CorrectionEnumHandler.java 
    3 // 
     1/* 
     2 * loci.formats.enums.handler.CorrectionHandler 
     3 * 
     4 *----------------------------------------------------------------------------- 
     5 * 
     6 *  Copyright (C) 2005-@year@ Open Microscopy Environment 
     7 *      Massachusetts Institute of Technology, 
     8 *      National Institutes of Health, 
     9 *      University of Dundee, 
     10 *      University of Wisconsin-Madison 
     11 * 
     12 * 
     13 * 
     14 *    This library is free software; you can redistribute it and/or 
     15 *    modify it under the terms of the GNU Lesser General Public 
     16 *    License as published by the Free Software Foundation; either 
     17 *    version 2.1 of the License, or (at your option) any later version. 
     18 * 
     19 *    This library is distributed in the hope that it will be useful, 
     20 *    but WITHOUT ANY WARRANTY; without even the implied warranty of 
     21 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
     22 *    Lesser General Public License for more details. 
     23 * 
     24 *    You should have received a copy of the GNU Lesser General Public 
     25 *    License along with this library; if not, write to the Free Software 
     26 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
     27 * 
     28 *----------------------------------------------------------------------------- 
     29 */ 
    430 
    5 /* 
    6 OME Bio-Formats package for reading and converting biological file formats. 
    7 Copyright (C) 2005-@year@ UW-Madison LOCI and Glencoe Software, Inc. 
    8  
    9 This program is free software; you can redistribute it and/or modify 
    10 it under the terms of the GNU General Public License as published by 
    11 the Free Software Foundation; either version 2 of the License, or 
    12 (at your option) any later version. 
    13  
    14 This program is distributed in the hope that it will be useful, 
    15 but WITHOUT ANY WARRANTY; without even the implied warranty of 
    16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    17 GNU General Public License for more details. 
    18  
    19 You should have received a copy of the GNU General Public License 
    20 along with this program; if not, write to the Free Software 
    21 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    22 */ 
     31/*----------------------------------------------------------------------------- 
     32 * 
     33 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
     34 * Created by callan via xsd-fu on 2009-10-28 16:52:37+0000 
     35 * 
     36 *----------------------------------------------------------------------------- 
     37 */ 
    2338 
    2439package loci.formats.enums.handler; 
     
    2944import loci.formats.enums.Enumeration; 
    3045import loci.formats.enums.EnumerationException; 
     46import loci.formats.enums.Correction; 
    3147 
    3248/** 
    33  * Enumeration handler for Objective Correction. 
     49 * Enumeration handler for Correction. 
    3450 * 
    3551 * <dl><dt><b>Source code:</b></dt> 
    36  * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/enums/handler/CorrectionEnumHandler.java">Trac</a>, 
    37  * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/enums/handler/CorrectionEnumHandler.java">SVN</a></dd></dl> 
     52 * <dd><a href="https://skyking.microscopy.wisc.edu/trac/java/browser/trunk/components/bio-formats/src/loci/formats/enums/handler/CorrectionHandler.java">Trac</a>, 
     53 * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/components/bio-formats/src/loci/formats/enums/handler/CorrectionHandler.java">SVN</a></dd></dl> 
    3854 */ 
    3955public class CorrectionEnumHandler implements IEnumerationHandler { 
     
    4662  private static Hashtable<String, String> makePatterns() { 
    4763    Hashtable<String, String> p = new Hashtable<String, String>(); 
    48     p.put("^\\s*Pl.*Apo.*$", "PlanApo"); 
    49     p.put("^\\s*Pl.*Flu.*$", "PlanFluor"); 
    50     p.put("^\\s*Sup.*Flu.*$", "SuperFluor"); 
    51     p.put("^\\s*Vio.*Corr.*$", "VioletCorrected"); 
    52     p.put("^\\s*Achr.*Flu.*$", "Achromat"); 
    53     p.put("^\\s*Neo.*flu.*$", "Neofluar"); 
    54     p.put("^\\s*Apo.*$", "Apo"); 
    55     p.put("^\\s*UV.*$", "UV"); 
    56     p.put("^\\s*Fluar.*$", "Fluar"); 
    57     p.put("^\\s*Neo.*fluar.*$", "Neofluar"); 
    58     p.put("^\\s*Pl.*Neo.*flu.*$", "PlanNeofluar"); 
    59     p.put("[Oo]ther", "Other"); 
     64    p.put("^\\s*UV", "UV"); 
     65    p.put("^\\s*PlanApo", "PlanApo"); 
     66    p.put("^\\s*PlanFluor", "PlanFluor"); 
     67    p.put("^\\s*SuperFluor", "SuperFluor"); 
     68    p.put("^\\s*VioletCorrected", "VioletCorrected"); 
     69    p.put("^\\s*Achro", "Achro"); 
     70    p.put("^\\s*Achromat", "Achromat"); 
     71    p.put("^\\s*Fluor", "Fluor"); 
     72    p.put("^\\s*Fl", "Fl"); 
     73    p.put("^\\s*Fluar", "Fluar"); 
     74    p.put("^\\s*Neofluar", "Neofluar"); 
     75    p.put("^\\s*Fluotar", "Fluotar"); 
     76    p.put("^\\s*Apo", "Apo"); 
     77    p.put("^\\s*PlanNeofluar", "PlanNeofluar"); 
     78    p.put("^\\s*Other", "Other"); 
    6079    return p; 
    6180  } 
     
    6483 
    6584  /* @see IEnumerationHandler#getEnumeration(String) */ 
    66   public <T extends Enumeration> T getEnumeration(String value) 
     85  public Enumeration getEnumeration(String value) 
    6786    throws EnumerationException 
    6887  { 
     
    7089      if (value.matches(pattern)) { 
    7190        String v = patterns.get(pattern); 
    72         // TODO : uncomment this once enum classes are committed 
    73         //Correction c = Correction.fromString(v); 
    74         //return c; 
     91        return Correction.fromString(v); 
    7592      } 
    7693    } 
     
    8097 
    8198  /* @see IEnumerationHandler#getEntity() */ 
    82   public String getEntity() { 
    83     return "Correction"; 
     99  public Class<? extends Enumeration> getEntity() { 
     100    return Correction.class; 
    84101  } 
    85102 
  • trunk/components/bio-formats/src/loci/formats/enums/handler/IEnumerationHandler.java

    r5639 r5642  
    4343   * @param value Value for which to find an enumeration. 
    4444   */ 
    45   <T extends Enumeration> T getEnumeration(String value) 
    46     throws EnumerationException; 
     45  Enumeration getEnumeration(String value) throws EnumerationException; 
    4746 
    4847  /** 
    4948   * Retrieve the entity corresponding to this handler. 
    5049   */ 
    51   String getEntity(); 
     50  Class<? extends Enumeration> getEntity(); 
    5251 
    5352} 
Note: See TracChangeset for help on using the changeset viewer.