PROXY-90 - Update pixelmed version

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@43944 356b4b1a-1d2b-0410-8bf1-ffa24008f01e

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>

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");

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) {