[(master)] Reverted unintentional changes

This commit is contained in:
Simon Marco Janic 2017-11-01 12:52:17 +01:00
parent 53674db357
commit 11dc917540
2 changed files with 162 additions and 175 deletions

View File

@ -1,105 +1,96 @@
package org.hl7.fhir.dstu3.model.codesystems; package org.hl7.fhir.dstu3.model.codesystems;
/* /*
Copyright (c) 2011+, HL7, Inc. Copyright (c) 2011+, HL7, Inc.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met: are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this * Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer. list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, * Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution. and/or other materials provided with the distribution.
* Neither the name of HL7 nor the names of its contributors may be used to * Neither the name of HL7 nor the names of its contributors may be used to
endorse or promote products derived from this software without specific endorse or promote products derived from this software without specific
prior written permission. prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
// Generated on Sat, Mar 25, 2017 21:03-0400 for FHIR v3.0.0 // Generated on Mon, Jan 16, 2017 12:12-0500 for FHIR v1.9.0
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;
public enum DeviceStatus { public enum Devicestatus {
/** /**
* The Device is available for use. Note: This means for *implanted devices* the device is implanted in the patient. * The Device is available for use.
*/ */
ACTIVE, AVAILABLE,
/** /**
* The Device is no longer available for use (e.g. lost, expired, damaged). Note: This means for *implanted devices* the device has been removed from the patient. * The Device is no longer available for use (e.g. lost, expired, damaged).
*/ */
INACTIVE, NOTAVAILABLE,
/** /**
* The Device was entered in error and voided. * The Device was entered in error and voided.
*/ */
ENTEREDINERROR, ENTEREDINERROR,
/** /**
* The status of the device has not been determined. * added to help the parsers
*/ */
UNKNOWN, NULL;
/** public static Devicestatus fromCode(String codeString) throws FHIRException {
* added to help the parsers if (codeString == null || "".equals(codeString))
*/ return null;
NULL; if ("available".equals(codeString))
public static DeviceStatus fromCode(String codeString) throws FHIRException { return AVAILABLE;
if (codeString == null || "".equals(codeString)) if ("not-available".equals(codeString))
return null; return NOTAVAILABLE;
if ("active".equals(codeString)) if ("entered-in-error".equals(codeString))
return ACTIVE; return ENTEREDINERROR;
if ("inactive".equals(codeString)) throw new FHIRException("Unknown Devicestatus code '"+codeString+"'");
return INACTIVE; }
if ("entered-in-error".equals(codeString)) public String toCode() {
return ENTEREDINERROR; switch (this) {
if ("unknown".equals(codeString)) case AVAILABLE: return "available";
return UNKNOWN; case NOTAVAILABLE: return "not-available";
throw new FHIRException("Unknown DeviceStatus code '"+codeString+"'"); case ENTEREDINERROR: return "entered-in-error";
} default: return "?";
public String toCode() { }
switch (this) { }
case ACTIVE: return "active"; public String getSystem() {
case INACTIVE: return "inactive"; return "http://hl7.org/fhir/devicestatus";
case ENTEREDINERROR: return "entered-in-error"; }
case UNKNOWN: return "unknown"; public String getDefinition() {
default: return "?"; switch (this) {
} case AVAILABLE: return "The Device is available for use.";
} case NOTAVAILABLE: return "The Device is no longer available for use (e.g. lost, expired, damaged).";
public String getSystem() { case ENTEREDINERROR: return "The Device was entered in error and voided.";
return "http://hl7.org/fhir/device-status"; default: return "?";
} }
public String getDefinition() { }
switch (this) { public String getDisplay() {
case ACTIVE: return "The Device is available for use. Note: This means for *implanted devices* the device is implanted in the patient."; switch (this) {
case INACTIVE: return "The Device is no longer available for use (e.g. lost, expired, damaged). Note: This means for *implanted devices* the device has been removed from the patient."; case AVAILABLE: return "Available";
case ENTEREDINERROR: return "The Device was entered in error and voided."; case NOTAVAILABLE: return "Not Available";
case UNKNOWN: return "The status of the device has not been determined."; case ENTEREDINERROR: return "Entered in Error";
default: return "?"; default: return "?";
} }
} }
public String getDisplay() {
switch (this) {
case ACTIVE: return "Active"; }
case INACTIVE: return "Inactive";
case ENTEREDINERROR: return "Entered in Error";
case UNKNOWN: return "Unknown";
default: return "?";
}
}
}

View File

@ -1,70 +1,66 @@
package org.hl7.fhir.dstu3.model.codesystems; package org.hl7.fhir.dstu3.model.codesystems;
/* /*
Copyright (c) 2011+, HL7, Inc. Copyright (c) 2011+, HL7, Inc.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met: are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this * Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer. list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, * Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution. and/or other materials provided with the distribution.
* Neither the name of HL7 nor the names of its contributors may be used to * Neither the name of HL7 nor the names of its contributors may be used to
endorse or promote products derived from this software without specific endorse or promote products derived from this software without specific
prior written permission. prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
// Generated on Sat, Mar 25, 2017 21:03-0400 for FHIR v3.0.0 // Generated on Mon, Jan 16, 2017 12:12-0500 for FHIR v1.9.0
import org.hl7.fhir.dstu3.model.EnumFactory; import org.hl7.fhir.dstu3.model.EnumFactory;
public class DeviceStatusEnumFactory implements EnumFactory<DeviceStatus> { public class DevicestatusEnumFactory implements EnumFactory<Devicestatus> {
public DeviceStatus fromCode(String codeString) throws IllegalArgumentException { public Devicestatus fromCode(String codeString) throws IllegalArgumentException {
if (codeString == null || "".equals(codeString)) if (codeString == null || "".equals(codeString))
return null; return null;
if ("active".equals(codeString)) if ("available".equals(codeString))
return DeviceStatus.ACTIVE; return Devicestatus.AVAILABLE;
if ("inactive".equals(codeString)) if ("not-available".equals(codeString))
return DeviceStatus.INACTIVE; return Devicestatus.NOTAVAILABLE;
if ("entered-in-error".equals(codeString)) if ("entered-in-error".equals(codeString))
return DeviceStatus.ENTEREDINERROR; return Devicestatus.ENTEREDINERROR;
if ("unknown".equals(codeString)) throw new IllegalArgumentException("Unknown Devicestatus code '"+codeString+"'");
return DeviceStatus.UNKNOWN; }
throw new IllegalArgumentException("Unknown DeviceStatus code '"+codeString+"'");
} public String toCode(Devicestatus code) {
if (code == Devicestatus.AVAILABLE)
public String toCode(DeviceStatus code) { return "available";
if (code == DeviceStatus.ACTIVE) if (code == Devicestatus.NOTAVAILABLE)
return "active"; return "not-available";
if (code == DeviceStatus.INACTIVE) if (code == Devicestatus.ENTEREDINERROR)
return "inactive"; return "entered-in-error";
if (code == DeviceStatus.ENTEREDINERROR) return "?";
return "entered-in-error"; }
if (code == DeviceStatus.UNKNOWN)
return "unknown"; public String toSystem(Devicestatus code) {
return "?"; return code.getSystem();
} }
public String toSystem(DeviceStatus code) { }
return code.getSystem();
}
}