diff --git a/gazelle-proxy-jar/pom.xml b/gazelle-proxy-jar/pom.xml index 972cb8ec0ae930ba5b976a1f8d323b72e1c134c0..4b2bea6f072d49aba48dd8148fe22d6798fa5578 100644 --- a/gazelle-proxy-jar/pom.xml +++ b/gazelle-proxy-jar/pom.xml @@ -21,7 +21,7 @@ <dependency> <groupId>com.pixelmed</groupId> <artifactId>dicom</artifactId> - <version>20140128</version> + <version>20141027</version> </dependency> <dependency> <groupId>dcm4che</groupId> diff --git a/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dicom/Dictionnaries.java b/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dicom/Dictionnaries.java index fa14ec1437c1939becf8f6ede38207e686bbe540..1161986b69d8d948c42bf2d0c06de455a4abac58 100644 --- a/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dicom/Dictionnaries.java +++ b/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dicom/Dictionnaries.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.TreeMap; import com.pixelmed.dicom.SOPClass; -import com.pixelmed.network.MessageServiceElementCommand_; +import com.pixelmed.network.MessageServiceElementCommand; public class Dictionnaries { @@ -37,8 +37,8 @@ public class Dictionnaries { 0x0FFF }; for (int command : commandFieldsIds) { - commandFields.put(MessageServiceElementCommand_.toString(command), - MessageServiceElementCommand_.toString(command)); + commandFields.put(MessageServiceElementCommand.toString(command), + MessageServiceElementCommand.toString(command)); } } @@ -218,10 +218,8 @@ public class Dictionnaries { sopClassByUID.put(SOPClass.PrivatePhilipsLiveRunStorage,"Philips Private Live Run Storage"); sopClassByUID.put(SOPClass.PrivatePhilipsRunStorage,"Philips Private Run Storage"); sopClassByUID.put(SOPClass.PrivatePhilipsReconstructionStorage,"Philips Private Reconstruction Storage"); - sopClassByUID.put(SOPClass.PrivatePhilipsPrivateXRayMFStorage,"Philips Private X-Ray Multiframe Storage"); sopClassByUID.put(SOPClass.PrivatePMODMultiframeImageStorage,"PMOD Private Multiframe Image Storage"); sopClassByUID.put(SOPClass.PrivatePixelMedLegacyConvertedEnhancedCTImageStorage,"Private PixelMed Legacy Converted Enhanced CT Image Storage"); - sopClassByUID.put(SOPClass.PrivatePixelMedLegacyFloatingPointImageStorage,"Private PixelMed Floating Point Image Storage"); sopClassByUID.put(SOPClass.DICOSCTImageStorage,"DICOS CT Image Storage"); sopClassByUID.put(SOPClass.DICOSDigitalXRayImageStorageForPresentation,"DICOS Digital X-Ray Image Storage - For Presentation"); diff --git a/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/model/message/DicomMessage.java b/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/model/message/DicomMessage.java index 0324c80e017482eb5f705a6c9419a4ad5682018a..f0afba765b2f0edf0c2d3e02584740ba4cf27431 100644 --- a/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/model/message/DicomMessage.java +++ b/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/model/message/DicomMessage.java @@ -50,7 +50,7 @@ import com.pixelmed.dicom.DicomDictionary; import com.pixelmed.dicom.DicomException; import com.pixelmed.dicom.DicomInputStream; import com.pixelmed.dicom.SOPClassDescriptions; -import com.pixelmed.network.MessageServiceElementCommand_; +import com.pixelmed.network.MessageServiceElementCommand; @Entity @Name("dicomMessage") @@ -178,7 +178,7 @@ public class DicomMessage extends AbstractMessage implements java.io.Serializabl } int[] integerValues = attributeValue.getIntegerValues(); for (Integer fieldValue : integerValues) { - String commandFieldTmp = MessageServiceElementCommand_.toString(fieldValue); + String commandFieldTmp = MessageServiceElementCommand.toString(fieldValue); bw.append(StringEscapeUtils.escapeHtml(commandFieldTmp)); bw.append(" "); } @@ -266,7 +266,7 @@ public class DicomMessage extends AbstractMessage implements java.io.Serializabl try { int[] integerValues = attributeValue.getIntegerValues(); for (Integer fieldValue : integerValues) { - String commandFieldTmp = MessageServiceElementCommand_.toString(fieldValue); + String commandFieldTmp = MessageServiceElementCommand.toString(fieldValue); infoCommandField=commandFieldTmp; } } catch (Exception e) {