Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 0326a2fa authored by Guillaume Thomazon's avatar Guillaume Thomazon
Browse files

PROXY-120 - Remove commented code 

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@46713 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
parent 43c94410
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 111 deletions
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/action/ChannelManagerBean.java
+ 0
− 46
View file @ 0326a2fa
......@@ -263,52 +263,6 @@ public class ChannelManagerBean implements Serializable {
}
}
// public void download() {
// if (!channelListIsEmpty()) {
//
// OutputStream output = null;
//
// FacesContext fc = FacesContext.getCurrentInstance();
// ExternalContext ec = fc.getExternalContext();
// ec.responseReset(); // Some JSF component library or some Filter
// // might have set some headers in the buffer
// // beforehand. We want to get rid of them, else
// // it may collide.
// ec.setResponseContentType("text/csv"); // Check
// // http://www.iana.org/assignments/media-types
// // for all types. Use if
// // necessary
// // ExternalContext#getMimeType()
// // for auto-detection based
// // on filename.
// ec.setResponseHeader("Content-Disposition",
// "attachment;filename=\"proxyChannels.csv\"");
// ec.setResponseCharacterEncoding("UTF-8");
//
// HttpServletResponse response = (HttpServletResponse) FacesContext
// .getCurrentInstance().getExternalContext().getResponse();
// try {
// output = ec.getResponseOutputStream();
// output = response.getOutputStream();
// OutputStreamWriter streamWriter = new OutputStreamWriter(output);
// CSVWriter writer = new CSVWriter(streamWriter);
// for (Proxy<?, ?> proxy : proxyBean.getListOfProxies()) {
// writer.writeNext(proxy.getConnectionConfigAsArray());
// }
// writer.close();
// streamWriter.close();
// // response.setContentType("text/csv");
// // response.setCharacterEncoding("utf-8");
// // response.setHeader("Content-Disposition",
// // "attachment;filename=\"proxyChannels.csv\"");
// output.close();
// FacesContext.getCurrentInstance().responseComplete();
// } catch (IOException e) {
// log.error(e.getMessage(), e);
// }
// }
// }
public void goHome() {
ExternalContext ec = FacesContext.getCurrentInstance().getExternalContext();
try {
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStep.java
+ 0
− 23
View file @ 0326a2fa
......@@ -324,16 +324,6 @@ public class MessageFilterStep<T extends AbstractMessage> implements MessageFilt
startDate = getStartDate(testInstance);
// For the moment the end date is the last modification of TI
endDate = getLastModifDate(testInstance);
// endDate = step.getDate();
// DateFormat dateFormat = new
// SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS", Locale.US);
// String date = dateFormat.format(endDate);
//
// try {
// endDate=dateFormat.parse(date);
// } catch (ParseException e) {
// log.error(""+e);
// }
criterions.add(new CritSimple("dateReceived", "date", startDate, CritSimpleType.GE));
criterions.add(new CritSimple("dateReceived", "date", endDate, CritSimpleType.LE));
......@@ -369,19 +359,6 @@ public class MessageFilterStep<T extends AbstractMessage> implements MessageFilt
lastModifDate = steps.get(indexOf).getDate();
}
// for (int i = 0; i < steps.size();) {
// for (int j = 1; j < steps.size();) {
// if (steps.get(i).getDate() != null && steps.get(j).getDate() != null
// && steps.get(i).getDate().compareTo(steps.get(j).getDate()) >= 0) {
// if (lastModifDate == startDate || lastModifDate == null ||
// lastModifDate.compareTo(steps.get(i).getDate()) <= 0) {
// lastModifDate = steps.get(i).getDate();
// }
// }
// j++;
// }
// i++;
// }
if (lastModifDate == null || startDate.compareTo(lastModifDate) >= 0) {
setLastModifDate(startDate);
Calendar cal = new GregorianCalendar();
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/gui/MessagesStepBean.java
+ 0
− 4
View file @ 0326a2fa
......@@ -86,8 +86,6 @@ public class MessagesStepBean implements Serializable {
}
public SelectItem[] getDicomAffectedSopClassUIDs() {
// Map<String, String> mapOfDicomUID =
// DicomMessage.getMapOfDicomUID(entityManager);
List<String> result = new ArrayList<String>();
Collections.sort(result);
return getSelectItems(result);
......@@ -110,8 +108,6 @@ public class MessagesStepBean implements Serializable {
}
public SelectItem[] getDicomCommandFields() {
// Map<Integer, String> mapOfCommandFields =
// DicomMessage.getMapOfCommandFields(entityManager);
List<String> result = new ArrayList<String>();
Collections.sort(result);
return getSelectItems(result);
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java
+ 0
− 1
View file @ 0326a2fa
......@@ -71,7 +71,6 @@ public class ProxyForTM implements IProxyForTM {
if (steps != null) {
for (Step step : steps) {
// never stopped
// step.setDate(endTI.getTime());
step.setDate(null);
step.setTestInstance(testInstance);
......
gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dicom/Dictionnaries.java
+ 0
− 2
View file @ 0326a2fa
......@@ -246,11 +246,9 @@ 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,
......
gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/gui/MessagesBean.java
+ 0
− 1
View file @ 0326a2fa
......@@ -382,7 +382,6 @@ public class MessagesBean implements Serializable {
getDicomAffectedSopClassUID(), getDicomCommandField(), getHl7MessageType(), getHttpMessageType());
} else {
log.error("Date problem");
// return null;
}
}
......
gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/jms/AbstractMessageHandler.java
+ 0
− 1
View file @ 0326a2fa
......@@ -21,7 +21,6 @@ public abstract class AbstractMessageHandler {
private QueueSession queueSession;
private Queue queue;
// protected Log logger = LogFactory.getLog( this.getClass() );
private static Logger log = LoggerFactory.getLogger(AbstractMessageHandler.class);
// Properties to initialize JNDI context
......
gazelle-proxy-netty/src/main/java/net/ihe/gazelle/proxy/netty/ConnectionConfigSimple.java
+ 0
− 20
View file @ 0326a2fa
......@@ -111,28 +111,8 @@ public class ConnectionConfigSimple implements ConnectionConfig, Comparable<Conn
public int compareTo(ConnectionConfigSimple o) {
if (o != null) {
return Integer.valueOf(this.getProxyProviderPort()).compareTo(Integer.valueOf(o.getProxyProviderPort()));
// if (this.getProxyProviderPort() > o.getProxyProviderPort()) {
// return 1;
// } else if (this.getProxyProviderPort() == o.getProxyProviderPort()) {
// return 0;
// } else {
// return -1;
// }
}
return -1;
}
// those getters and setters are required to parse the CSV files
// public void setProxyProviderPort(int proxyProviderPort) {
// this.proxyProviderPort = proxyProviderPort;
// }
//
// public void setProxyConsumerHost(String proxyConsumerHost) {
// this.proxyConsumerHost = proxyConsumerHost;
// }
//
// public void setProxyConsumerPort(int proxyConsumerPort) {
// this.proxyConsumerPort = proxyConsumerPort;
// }
}
gazelle-proxy-netty/src/main/java/net/ihe/gazelle/proxy/netty/protocols/dicom/DicomDecoder.java
+ 0
− 13
View file @ 0326a2fa
......@@ -21,15 +21,11 @@ public class DicomDecoder extends SimpleChannelUpstreamHandler {
static final Logger log = LoggerFactory.getLogger(DicomDecoder.class);
private DimseMessageParser dimseMessageParser;
// private PipedOutputStream pos;
public DicomDecoder(String storageFolder) {
super();
try {
dimseMessageParser = new DimseMessageParser(new Association(), storageFolder);
// PipedInputStream pis = new PipedInputStream();
// pos = new PipedOutputStream(pis);
// new Thread(new ProxyAssociation(storageFolder, pis)).run();
} catch (IOException e) {
throw new IllegalArgumentException(e);
}
......@@ -57,12 +53,6 @@ public class DicomDecoder extends SimpleChannelUpstreamHandler {
Channels.fireMessageReceived(ctx, dimseMessage);
}
// pos.write(buf);
// List<ProxyDicomMessage> messages =
// proxyAssociation.getMessages();
// for (ProxyDicomMessage dicomMessage : messages) {
// Channels.fireMessageReceived(ctx, dicomMessage);
// }
} catch (Exception ex) {
log.error("", ex);
}
......@@ -71,19 +61,16 @@ public class DicomDecoder extends SimpleChannelUpstreamHandler {
@Override
public void channelUnbound(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
super.channelUnbound(ctx, e);
// pos.close();
}
@Override
public void channelDisconnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
super.channelDisconnected(ctx, e);
// pos.close();
}
@Override
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
super.channelClosed(ctx, e);
// pos.close();
}
@Override
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment