Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15721] dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/ src/main/java/org/dcm4chee/web/war/tc
|
From: <rob...@us...> - 2011-07-27 08:10:08
|
Revision: 15721
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15721&view=rev
Author: robertdavid
Date: 2011-07-27 08:10:00 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
[#WEB-412] Provide teaching-file search page based on matching of content-item sequence
Modified Paths:
--------------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetails.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsAuthorTab.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsBibliographyTab.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsDefaultTab.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsDiagnosisTab.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsImagesTab.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsInfoTab.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsPanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCModel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCPanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCResultPanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCSearchPanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeyword.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordListInput.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordNode.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordTreeInput.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRData.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRKeyword.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRKeywordNode.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/TCKeywordACRInput.java
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetails.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetails.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetails.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -29,6 +29,8 @@
public class TCDetails implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private final static Logger log = LoggerFactory.getLogger(TCDetails.class);
private String abstr;
@@ -231,7 +233,7 @@
return Collections.emptyList();
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked" })
public List<InstanceRef> getReferencedImages() {
List<InstanceRef> refs = instanceRefs != null ? new ArrayList<InstanceRef>(
instanceRefs) : (List) Collections.emptyList();
@@ -610,6 +612,9 @@
}
public static class InstanceRef implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
private String stuid;
private String suid;
@@ -648,6 +653,9 @@
}
public static class DicomCode implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
private String value;
private String designator;
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsAuthorTab.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsAuthorTab.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsAuthorTab.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -53,15 +53,23 @@
*/
public class TCDetailsAuthorTab extends Panel {
+ private static final long serialVersionUID = 1L;
+
public TCDetailsAuthorTab(final String id) {
super(id);
add(new Label("details-author-name", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.AuthorName);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.AuthorName));
@@ -69,11 +77,17 @@
}));
add(new Label("details-author-affiliation", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.AuthorAffiliation);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title",
@@ -82,6 +96,9 @@
}));
add(new MultiLineLabel("details-author-contact", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.AuthorContact);
@@ -100,5 +117,4 @@
return s != null ? s : "-";
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsBibliographyTab.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsBibliographyTab.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsBibliographyTab.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -53,11 +53,16 @@
*/
public class TCDetailsBibliographyTab extends Panel {
+ private static final long serialVersionUID = 1L;
+
public TCDetailsBibliographyTab(final String id) {
super(id);
ListView<String> list = new ListView<String>("bibliography-list",
new Model<ArrayList<String>>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public ArrayList<String> getObject() {
TCDetails o = getTCObject();
@@ -68,10 +73,16 @@
0);
}
}) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(final ListItem<String> item) {
WebMarkupContainer wmc = new WebMarkupContainer(
"bibliography-separator") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public boolean isVisible() {
return item.getIndex() < getList().size() - 1;
@@ -90,5 +101,4 @@
private TCDetails getTCObject() {
return (TCDetails) getDefaultModelObject();
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsDefaultTab.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsDefaultTab.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsDefaultTab.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -49,10 +49,15 @@
*/
public abstract class TCDetailsDefaultTab extends Panel {
+ private static final long serialVersionUID = 1L;
+
public TCDetailsDefaultTab(final String id) {
super(id);
add(new MultiLineLabel("details-text", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(getKey());
@@ -73,5 +78,4 @@
return s != null ? s : "-";
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsDiagnosisTab.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsDiagnosisTab.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsDiagnosisTab.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -51,10 +51,15 @@
*/
public class TCDetailsDiagnosisTab extends Panel {
+ private static final long serialVersionUID = 1L;
+
public TCDetailsDiagnosisTab(final String id) {
super(id);
add(new MultiLineLabel("details-diagnosis", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Diagnosis);
@@ -62,6 +67,9 @@
}));
add(new Label("details-diagnosis-confirmed", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
YesNo yesno = null;
@@ -100,5 +108,4 @@
return s != null ? s : "-";
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsImagesTab.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsImagesTab.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsImagesTab.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -61,6 +61,9 @@
* @since May 27, 2011
*/
public class TCDetailsImagesTab extends Panel {
+
+ private static final long serialVersionUID = 1L;
+
private WebMarkupContainer navWmc;
public TCDetailsImagesTab(final String id) {
@@ -75,6 +78,9 @@
GridView<InstanceRef> view = new GridView<InstanceRef>(
"details-image-row", new ReferencedImageProvider()) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void populateItem(final Item<InstanceRef> item) {
InstanceRef ref = item.getModelObject();
@@ -103,6 +109,9 @@
view.setRows(rows);
navWmc = new WebMarkupContainer("details-images-nav-container") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public boolean isVisible() {
TCDetails o = getTCObject();
@@ -124,7 +133,10 @@
}
public class ReferencedImageProvider implements IDataProvider<InstanceRef> {
- @SuppressWarnings({ "unchecked", "rawtypes" })
+
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings({ "unchecked" })
@Override
public Iterator<InstanceRef> iterator(int first, int count) {
TCDetails o = getTCObject();
@@ -156,5 +168,4 @@
public void detach() {
}
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsInfoTab.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsInfoTab.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsInfoTab.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -55,6 +55,8 @@
*/
public class TCDetailsInfoTab extends Panel {
+ private static final long serialVersionUID = 1L;
+
private static final TCKeywordCatalogueProvider catProv = TCKeywordCatalogueProvider
.getInstance();
@@ -64,11 +66,17 @@
WebMarkupContainer titleWmc = new WebMarkupContainer(
"details-title-row");
titleWmc.add(new Label("details-title", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Title);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.Title));
@@ -79,6 +87,9 @@
"details-abstract-row");
abstractWmc.add(new MultiLineLabel("details-abstract",
new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Abstract);
@@ -88,11 +99,17 @@
WebMarkupContainer keywordWmc = new WebMarkupContainer(
"details-keyword-row");
keywordWmc.add(new Label("details-keyword", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Keyword);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.Keyword));
@@ -102,11 +119,17 @@
WebMarkupContainer anatomyWmc = new WebMarkupContainer(
"details-anatomy-row");
anatomyWmc.add(new Label("details-anatomy", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Anatomy);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.Anatomy));
@@ -116,11 +139,17 @@
WebMarkupContainer pathologyWmc = new WebMarkupContainer(
"details-pathology-row");
pathologyWmc.add(new Label("details-pathology", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Pathology);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.Pathology));
@@ -130,11 +159,17 @@
WebMarkupContainer findingWmc = new WebMarkupContainer(
"details-finding-row");
findingWmc.add(new Label("details-finding", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Finding);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.Finding));
@@ -144,11 +179,17 @@
WebMarkupContainer diagnosisWmc = new WebMarkupContainer(
"details-diagnosis-row");
diagnosisWmc.add(new Label("details-diagnosis", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Diagnosis);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.Diagnosis));
@@ -159,22 +200,31 @@
"details-diffdiagnosis-row");
diffdiagnosisWmc.add(new Label("details-diffdiagnosis",
new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.DifferentialDiagnosis);
}
}).add(new AbstractBehavior() {
- @Override
- public void onComponentTag(Component c, ComponentTag tag) {
- tag.put("title",
- getStringValue(TCQueryFilterKey.DifferentialDiagnosis));
- }
- }));
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onComponentTag(Component c, ComponentTag tag) {
+ tag.put("title",
+ getStringValue(TCQueryFilterKey.DifferentialDiagnosis));
+ }
+ }));
+
WebMarkupContainer diagnosisConfirmedWmc = new WebMarkupContainer(
"details-diagnosis-confirmed-row");
diagnosisConfirmedWmc.add(new Label("details-diagnosis-confirmed",
new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.DiagnosisConfirmed);
@@ -184,11 +234,17 @@
WebMarkupContainer categoryWmc = new WebMarkupContainer(
"details-category-row");
categoryWmc.add(new Label("details-category", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Category);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.Category));
@@ -198,11 +254,17 @@
WebMarkupContainer levelWmc = new WebMarkupContainer(
"details-level-row");
levelWmc.add(new Label("details-level", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.Level);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title", getStringValue(TCQueryFilterKey.Level));
@@ -212,11 +274,17 @@
WebMarkupContainer modalitiesWmc = new WebMarkupContainer(
"details-modalities-row");
modalitiesWmc.add(new Label("details-modalities", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.AcquisitionModality);
}
}).add(new AbstractBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onComponentTag(Component c, ComponentTag tag) {
tag.put("title",
@@ -227,6 +295,9 @@
WebMarkupContainer patientSexWmc = new WebMarkupContainer(
"details-patient-sex-row");
patientSexWmc.add(new Label("details-patient-sex", new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.PatientSex);
@@ -237,18 +308,24 @@
"details-patient-species-row");
patientSpeciesWmc.add(new Label("details-patient-species",
new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
return getStringValue(TCQueryFilterKey.PatientSpecies);
}
}).add(new AbstractBehavior() {
- @Override
- public void onComponentTag(Component c, ComponentTag tag) {
- tag.put("title",
- getStringValue(TCQueryFilterKey.PatientSpecies));
- }
- }));
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onComponentTag(Component c, ComponentTag tag) {
+ tag.put("title",
+ getStringValue(TCQueryFilterKey.PatientSpecies));
+ }
+ }));
+
if (catProv != null) {
diffdiagnosisWmc.setVisible(catProv
.hasCatalogue(TCQueryFilterKey.DifferentialDiagnosis));
@@ -286,5 +363,4 @@
return s != null ? s : "-";
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsPanel.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCDetailsPanel.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -55,8 +55,6 @@
import org.apache.wicket.resource.loader.PackageStringResourceLoader;
import org.dcm4chee.web.dao.tc.TCQueryFilterKey;
import org.dcm4chee.web.war.tc.keywords.TCKeywordCatalogueProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author Bernhard Ableitinger <ber...@ag...>
@@ -64,9 +62,9 @@
* @since May 27, 2011
*/
public class TCDetailsPanel extends Panel {
- private static final Logger log = LoggerFactory
- .getLogger(TCDetailsPanel.class);
+ private static final long serialVersionUID = 1L;
+
private WebMarkupContainer errordetailsContainer;
private WebMarkupContainer nodetailsContainer;
@@ -81,6 +79,9 @@
TCKeywordCatalogueProvider catProv = TCKeywordCatalogueProvider
.getInstance();
final Model<TCDetails> tabModel = new Model<TCDetails>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public TCDetails getObject() {
return (TCDetails) TCDetailsPanel.this.getDefaultModelObject();
@@ -90,6 +91,9 @@
List<ITab> tabs = new ArrayList<ITab>();
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.info.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsInfoTab(id);
@@ -106,6 +110,9 @@
if (!catProv.hasCatalogue(TCQueryFilterKey.Diagnosis)) {
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.diagnosis.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsDiagnosisTab(id);
@@ -130,9 +137,15 @@
if (!catProv.hasCatalogue(TCQueryFilterKey.DifferentialDiagnosis)) {
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.differential-diagnosis.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsDefaultTab(id) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public TCQueryFilterKey getKey() {
return TCQueryFilterKey.DifferentialDiagnosis;
@@ -154,9 +167,15 @@
if (!catProv.hasCatalogue(TCQueryFilterKey.Finding)) {
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.finding.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsDefaultTab(id) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public TCQueryFilterKey getKey() {
return TCQueryFilterKey.Finding;
@@ -177,9 +196,15 @@
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.history.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsDefaultTab(id) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public TCQueryFilterKey getKey() {
return TCQueryFilterKey.History;
@@ -199,9 +224,15 @@
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.discussion.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsDefaultTab(id) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public TCQueryFilterKey getKey() {
return TCQueryFilterKey.Discussion;
@@ -221,9 +252,15 @@
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.organsystem.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsDefaultTab(id) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public TCQueryFilterKey getKey() {
return TCQueryFilterKey.OrganSystem;
@@ -243,6 +280,9 @@
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.author.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsAuthorTab(id);
@@ -265,6 +305,9 @@
});
tabs.add(new AbstractDetailsTab(new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
String title = new PackageStringResourceLoader()
.loadStringResource(TCDetailsPanel.class,
"tc.details.tab.images.title.text", null, null);
@@ -281,6 +324,9 @@
return sbuf.toString();
}
}) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsImagesTab(id);
@@ -299,6 +345,9 @@
tabs.add(new AbstractDetailsTab(new ResourceModel(
"tc.details.tab.bibliography.title.text")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Panel getPanel(String id) {
Panel tab = new TCDetailsBibliographyTab(id);
@@ -355,6 +404,9 @@
}
private static abstract class AbstractDetailsTab extends AbstractTab {
+
+ private static final long serialVersionUID = 1L;
+
public AbstractDetailsTab(IModel<String> titleModel) {
super(titleModel);
}
@@ -363,6 +415,9 @@
}
private static class DetailsTabbedPanel extends AjaxTabbedPanel {
+
+ private static final long serialVersionUID = 1L;
+
public DetailsTabbedPanel(final String id, List<ITab> tabs) {
super(id, tabs);
}
@@ -370,6 +425,9 @@
@Override
protected WebMarkupContainer newLink(String linkId, final int index) {
AjaxFallbackLink<Void> link = new AjaxFallbackLink<Void>(linkId) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget target) {
if (((AbstractDetailsTab) getTabs().get(index))
@@ -384,18 +442,20 @@
};
link.add(new AttributeModifier("class", true,
new AbstractReadOnlyModel<String>() {
- @Override
- public String getObject() {
- if (((AbstractDetailsTab) getTabs().get(index))
- .isDataAvailable()) {
- return "enabled";
- } else {
- return "disabled";
- }
- }
- }));
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getObject() {
+ if (((AbstractDetailsTab) getTabs().get(index))
+ .isDataAvailable()) {
+ return "enabled";
+ } else {
+ return "disabled";
+ }
+ }
+ }));
return link;
}
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCModel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCModel.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCModel.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -60,6 +60,9 @@
* @since May 04, 2011
*/
public class TCModel extends InstanceModel {
+
+ private static final long serialVersionUID = 1L;
+
private String fsId;
private String fileId;
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCPanel.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCPanel.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -54,6 +54,9 @@
* @since April 28, 2011
*/
public class TCPanel extends Panel {
+
+ private static final long serialVersionUID = 1L;
+
private static final Logger log = LoggerFactory.getLogger(TCPanel.class);
private static final ResourceReference CSS = new CompressedResourceReference(
@@ -75,6 +78,9 @@
final TCListModel listModel = new TCListModel();
final TCResultPanel listPanel = new TCResultPanel("result-panel",
listModel) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Component selectionChanged(TCModel tc) {
try {
@@ -95,6 +101,9 @@
add(macb);
add(new TCSearchPanel("search-panel") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Component doSearch(TCQueryFilter filter) {
listModel.update(filter);
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCResultPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCResultPanel.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCResultPanel.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -90,6 +90,9 @@
* @since April 28, 2011
*/
public class TCResultPanel extends Panel {
+
+ private static final long serialVersionUID = 1L;
+
private static final Logger log = LoggerFactory
.getLogger(TCResultPanel.class);
@@ -113,6 +116,9 @@
final DataView<TCModel> dataView = new DataView<TCModel>("row",
tclistProvider) {
+
+ private static final long serialVersionUID = 1L;
+
private final StudyListLocal dao = (StudyListLocal) JNDIUtils
.lookup(StudyListLocal.JNDI_NAME);
@@ -128,9 +134,15 @@
item.add(new TCMultiLineLabel("author", tc.getAuthor(), 80));
item.add(new Label("date",
new Model<Date>(tc.getCreationDate())) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public IConverter getConverter(Class<?> type) {
return new DateConverter() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public DateFormat getDateFormat(Locale locale) {
if (locale == null) {
@@ -160,6 +172,9 @@
+ ":webviewerInstanceLink"));
item.add(new AbstractDefaultAjaxBehavior() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void respond(AjaxRequestTarget target) {
target.addComponent(item);
@@ -181,6 +196,9 @@
item.add(new AttributeModifier("onmouseover", true,
new AbstractReadOnlyModel<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
if (selected != null && selected.equals(tc)) {
@@ -194,6 +212,9 @@
item.add(new AttributeModifier("onmouseout", true,
new AbstractReadOnlyModel<String>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String getObject() {
if (selected != null && selected.equals(tc)) {
@@ -206,6 +227,9 @@
}));
item.add(new AjaxEventBehavior("onclick") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onEvent(AjaxRequestTarget target) {
selected = tc;
@@ -228,6 +252,9 @@
OrderByBorder titleBorder = new OrderByBorder("titleColumn", "Title",
tclistProvider) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSortChanged() {
if (selected == null) {
@@ -241,6 +268,9 @@
OrderByBorder abstractBorder = new OrderByBorder("abstractColumn",
"Abstract", tclistProvider) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSortChanged() {
if (selected == null) {
@@ -254,6 +284,9 @@
OrderByBorder authorBorder = new OrderByBorder("authorColumn",
"Author", tclistProvider) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSortChanged() {
if (selected == null) {
@@ -267,6 +300,9 @@
OrderByBorder dateBorder = new OrderByBorder("dateColumn", "Date",
tclistProvider) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSortChanged() {
if (selected == null) {
@@ -300,6 +336,9 @@
add(new Label("numberOfMatchingInstances", new StringResourceModel(
"tc.list.numberOfMatchingInstances", this, null,
new Object[] { new Model<Integer>() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Integer getObject() {
return ((TCListModel) TCResultPanel.this
@@ -338,6 +377,9 @@
}
public static class TCListModel extends Model<ArrayList<TCModel>> {
+
+ private static final long serialVersionUID = 1L;
+
private TCQueryLocal dao = (TCQueryLocal) JNDIUtils
.lookup(TCQueryLocal.JNDI_NAME);
@@ -394,6 +436,9 @@
}
public class SortableTCListProvider extends SortableDataProvider<TCModel> {
+
+ private static final long serialVersionUID = 1L;
+
private TCListModel model;
public SortableTCListProvider(TCListModel model) {
@@ -403,7 +448,7 @@
setSort(TCModel.Sorter.Date.name(), false);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked" })
@Override
public Iterator<TCModel> iterator(int first, int count) {
List<TCModel> items = model.getObject();
@@ -467,5 +512,4 @@
return null;
}
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCSearchPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCSearchPanel.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCSearchPanel.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -87,6 +87,9 @@
* @since April 28, 2011
*/
public abstract class TCSearchPanel extends Panel {
+
+ private static final long serialVersionUID = 1L;
+
private static final Logger log = LoggerFactory
.getLogger(TCSearchPanel.class);
@@ -160,6 +163,9 @@
final IndicatingAjaxButton searchBtn = new IndicatingAjaxButton(
"doSearchBtn") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
try {
@@ -305,6 +311,9 @@
"vertical-align: middle;"))).setOutputMarkupId(true));
AjaxButton resetBtn = new IndicatingAjaxButton("resetSearchBtn") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
TCQueryFilter filter = (TCQueryFilter) TCSearchPanel.this
@@ -376,6 +385,9 @@
AjaxCheckBox advancedOptionsChkBox = new AjaxCheckBox(
"advancedOptionsToggle", new PropertyModel<Boolean>(wmc,
"visible")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onUpdate(AjaxRequestTarget target) {
target.addComponent(wmc);
@@ -421,6 +433,9 @@
final String id, IModel<T> model, List<T> options,
boolean localizeValues, final String localizePrefix) {
DropDownChoice<T> choice = new DropDownChoice<T>(id, model, options) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected String getNullValidKey() {
return TCPanel.ModuleName + ".search.null.text";
@@ -431,6 +446,9 @@
if (localizeValues) {
choice.setChoiceRenderer(new EnumChoiceRenderer<T>(choice) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected String resourceKey(T object) {
String key = localizePrefix != null ? localizePrefix + "."
@@ -458,6 +476,9 @@
final TCKeywordInput input = cat.createInput(componentId, keyword);
return new IKeywordAwareInput() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Object getSearchObject() {
TCKeyword kw = input.getSelectedKeyword();
@@ -496,6 +517,9 @@
fragment.add(tf);
return new IKeywordAwareInput() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Object getSearchObject() {
return tf.getDefaultModelObjectAsString();
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeyword.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeyword.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeyword.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -48,6 +48,8 @@
*/
public class TCKeyword implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private String name;
private DicomCode code;
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordListInput.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordListInput.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordListInput.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -67,6 +67,9 @@
* @since June 20, 2011
*/
public class TCKeywordListInput extends Panel implements TCKeywordInput {
+
+ private static final long serialVersionUID = 1L;
+
public TCKeywordListInput(final String id, List<TCKeyword> keywords) {
this(id, null, keywords);
}
@@ -78,6 +81,9 @@
final AutoCompleteTextField<TCKeyword> text = new AutoCompleteTextField<TCKeyword>(
"text", getModel(), TCKeyword.class, new AutoCompleteSettings()) {
+
+ private static final long serialVersionUID = 1L;
+
final Map<String, TCKeyword> keywordMap = new HashMap<String, TCKeyword>();
@Override
@@ -90,6 +96,9 @@
}
}
return new IConverter() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String convertToString(Object o, Locale locale) {
return o != null ? o.toString() : null;
@@ -137,6 +146,9 @@
final ListChoice<TCKeyword> keywordList = new ListChoice<TCKeyword>(
"keyword-list", new Model<TCKeyword>(selectedKeyword), keywords) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected String getNullValidKey() {
return "tc.search.null.text";
@@ -145,6 +157,9 @@
keywordList.setOutputMarkupId(true);
keywordList.setNullValid(true);
keywordList.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onUpdate(AjaxRequestTarget target) {
TCKeyword choosenKeyword = keywordList.getModelObject();
@@ -170,6 +185,9 @@
popup.add(keywordList);
popup.add(new AjaxButton("popup-close-button") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onSubmit(AjaxRequestTarget target, Form<?> form) {
MarkupContainer parent = TCKeywordListInput.this.getParent();
@@ -192,6 +210,9 @@
add(text);
add(new AjaxButton("chooser-button", new Model<String>("...")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onSubmit(AjaxRequestTarget target, Form<?> form) {
target.appendJavascript("setPositionRelativeToParent('"
@@ -225,7 +246,7 @@
return this;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked" })
private Model<TCKeyword> getModel() {
return (Model) getDefaultModel();
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordNode.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordNode.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordNode.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -53,6 +53,8 @@
*/
public class TCKeywordNode implements TreeNode, Serializable {
+ private static final long serialVersionUID = 1L;
+
private TCKeyword keyword;
private TCKeywordNode parent;
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordTreeInput.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordTreeInput.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/TCKeywordTreeInput.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -71,6 +71,8 @@
*/
public class TCKeywordTreeInput extends Panel implements TCKeywordInput {
+ private static final long serialVersionUID = 1L;
+
public TCKeywordTreeInput(final String id, final TCKeywordNode root) {
this(id, null, root);
}
@@ -82,10 +84,16 @@
final AutoCompleteTextField<TCKeyword> text = new AutoCompleteTextField<TCKeyword>(
"text", getModel(), TCKeyword.class, new AutoCompleteSettings()) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public IConverter getConverter(Class<?> type) {
if (TCKeyword.class.equals(type)) {
return new IConverter() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public String convertToString(Object o, Locale locale) {
return o != null ? o.toString() : null;
@@ -128,6 +136,9 @@
popup.setVisible(false);
final Tree tree = new Tree("keyword-tree", new DefaultTreeModel(root)) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onNodeLinkClicked(AjaxRequestTarget target,
TreeNode node) {
@@ -161,6 +172,9 @@
tree.getTreeState().setAllowSelectMultiple(false);
popup.add(new AjaxFallbackLink<String>("popup-close-button") {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget target) {
MarkupContainer parent = TCKeywordTreeInput.this.getParent();
@@ -184,6 +198,9 @@
"tc-utils.js"));
add(text);
add(new AjaxButton("chooser-button", new Model<String>("...")) {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public void onSubmit(AjaxRequestTarget target, Form<?> form) {
TCKeyword keyword = TCKeywordTreeInput.this
@@ -230,7 +247,7 @@
return this;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked" })
private Model<TCKeyword> getModel() {
return (Model) getDefaultModel();
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRData.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRData.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRData.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -42,8 +42,8 @@
* @version $Revision$ $Date$
* @since June 22, 2011
*/
-public class ACRData
-{
+public class ACRData {
+
public static String[] rawdataAnatomy = new String[]
{
"Breast;0",
@@ -3272,7 +3272,7 @@
"314;Vascular, lymphatic origin",
"3141;Hemangioma",
"3142;Lymphangioma",
- "3143;Skeletal angiomatosis include: gorham disease (\xECvanishing bone\xEE) (see also .18",
+ "3143;Skeletal angiomatosis include: gorham disease (�vanishing bone�) (see also .18",
"3149;Other include: hemangiopericytoma (benign or malignant)",
"315;Nerve tissue origin",
"318;Unknown origin",
@@ -5245,7 +5245,7 @@
"285;Hydrops, empyema, acute cholecystitis, intraperitoneal perforation of gallbladde",
"286;Milk of calcium bile, calcified gallbladder wall",
"287;Hyperplastic cholecystosis",
- "288;Sclerosing cholangitis, primary biliary cirrhosis, caroli\xEDs disease, other abnor",
+ "288;Sclerosing cholangitis, primary biliary cirrhosis, caroli�s disease, other abnor",
"289;Other include: gallstone on plain film (76.2891), recurrent pyogenic cholang",
"29;Miscellaneous",
"291;Esophagitis (see .85), gastritis, duodenitis, appendicitis, hepatitis, pancreati",
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRKeyword.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRKeyword.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRKeyword.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -45,8 +45,10 @@
* @version $Revision$ $Date$
* @since May 30, 2011
*/
-public class ACRKeyword extends TCKeyword
-{
+public class ACRKeyword extends TCKeyword {
+
+ private static final long serialVersionUID = 1L;
+
private static final String NAME_DELIMITER = " - ";
private static final String VALUE_DELIMITER = ".";
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRKeywordNode.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRKeywordNode.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/ACRKeywordNode.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -48,6 +48,8 @@
*/
public class ACRKeywordNode extends TCKeywordNode {
+ private static final long serialVersionUID = 1L;
+
private String id;
private ACRKeywordNode(String id, String name, DicomCode code) {
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/TCKeywordACRInput.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/TCKeywordACRInput.java 2011-07-27 07:54:16 UTC (rev 15720)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/keywords/acr/TCKeywordACRInput.java 2011-07-27 08:10:00 UTC (rev 15721)
@@ -73,6 +73,9 @@
* @since June 20, 2011
*/
public class TCKeywordACRInput extends Panel implements TCKeywordInput {
+
+ private static final long serialVersionUID = 1L;
+
public TCKeywordACRInput(final String id) {
this(id, null);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
