diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java index 2c1afe1f1dc..e9a2b261381 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java @@ -376,7 +376,7 @@ public boolean isRequired() { } } - // System.out.print("at return " + this.datasetFieldType.getDisplayName() + " " + required); + // logger.fine("at return " + this.datasetFieldType.getDisplayName() + " " + required); return required; } diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index 282e9825ec3..ec208d021a6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -726,8 +726,8 @@ private void updateDatasetFieldInputLevels() { } public void handleChange() { - System.out.print("handle change"); - System.out.print("new value " + selectedTemplate.getId()); + logger.info("handle change"); + logger.info("new value " + selectedTemplate.getId()); } public void handleChangeButton() { @@ -790,7 +790,7 @@ public MapLayerMetadata getMapLayerMetadata(DataFile df) { } private void msg(String s){ - //System.out.println(s); + //logger.fine(s); } /** @@ -957,7 +957,7 @@ private void loadMapLayerMetadataLookup() { public String init() { - // System.out.println("_YE_OLDE_QUERY_COUNTER_"); // for debug purposes + // logger.fine("_YE_OLDE_QUERY_COUNTER_"); // for debug purposes String nonNullDefaultIfKeyNotFound = ""; this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSize(); @@ -1620,7 +1620,6 @@ public String saveLinkedDataset() { } catch (CommandException ex) { String msg = "There was a problem linking this dataset to yours: " + ex; - System.out.print("in catch exception... " + ex); logger.severe(msg); /** * @todo how do we get this message to show up in the GUI? diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java index 9303efbd021..175f7be8248 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java @@ -62,8 +62,8 @@ public RetrieveDatasetVersionResponse(DatasetVersion datasetVersion, String requ if (datasetVersion == null){ throw new IllegalArgumentException("datasetVersion cannot be null"); } - //System.out.println("RetrieveDatasetVersionResponse: datasetVersion: " + datasetVersion.getSemanticVersion() + " requestedVersion: " + requestedVersion); - //System.out.println("chosenVersion id: " + datasetVersion.getId() + " getFriendlyVersionNumber: " + datasetVersion.getFriendlyVersionNumber()); + //logger.fine("RetrieveDatasetVersionResponse: datasetVersion: " + datasetVersion.getSemanticVersion() + " requestedVersion: " + requestedVersion); + //logger.fine("chosenVersion id: " + datasetVersion.getId() + " getFriendlyVersionNumber: " + datasetVersion.getFriendlyVersionNumber()); this.datasetVersionForResponse = datasetVersion; this.actualVersion = datasetVersion.getSemanticVersion(); @@ -97,7 +97,7 @@ private void checkVersion(){ if (actualVersion==null){ // this shouldn't happen return; } - //System.out.println("check version. requested: " + this.requestedVersion + " returned: " + actualVersion); + //logger.fine("check version. requested: " + this.requestedVersion + " returned: " + actualVersion); // This may often be the case if version is not specified // if (requestedVersion == null || requestedVersion.equals("")){ @@ -161,7 +161,7 @@ public DatasetVersion findByFriendlyVersionNumber(Long datasetId, String friendl query.setParameter("minorVersionNumber", minorVersionNumber); foundDatasetVersion = (DatasetVersion) query.getSingleResult(); } catch (javax.persistence.NoResultException e) { - System.out.print("no ds version found: " + datasetId + " " + friendlyVersionNumber); + logger.warning("no ds version found: " + datasetId + " " + friendlyVersionNumber); // DO nothing, just return null. } return foundDatasetVersion; @@ -195,7 +195,7 @@ public DatasetVersion findByFriendlyVersionNumber(Long datasetId, String friendl return retVal; } catch (javax.persistence.NoResultException e) { - System.out.print("no ds version found: " + datasetId + " " + friendlyVersionNumber); + logger.warning("no ds version found: " + datasetId + " " + friendlyVersionNumber); // DO nothing, just return null. } @@ -247,7 +247,7 @@ public Long[] parseVersionNumber(String version){ private void msg(String s){ - //System.out.println(s); + //logger.fine(s); } /** diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevelServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevelServiceBean.java index 0ac09071b97..29497a2c3e0 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevelServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseFieldTypeInputLevelServiceBean.java @@ -8,6 +8,7 @@ import edu.harvard.iq.dataverse.util.LruCache; import java.util.List; import java.util.Set; +import java.util.logging.Logger; import javax.ejb.Stateless; import javax.inject.Named; import javax.persistence.EntityManager; @@ -23,6 +24,7 @@ @Named public class DataverseFieldTypeInputLevelServiceBean { +// private static final Logger logger = Logger.getLogger(DataverseFieldTypeInputLevelServiceBean.class.getCanonicalName()); public static final LruCache> cache = new LruCache(); @PersistenceContext(unitName = "VDCNet-ejbPU") @@ -42,7 +44,7 @@ public List findByDataverseId(Long dataverseId) { } private void msg(String s){ - //System.out.println(s); + //logger.fine(s); } /**