task_24532 #13
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="target/geoportal-data-viewer-app-3.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
<classpathentry kind="src" output="target/geoportal-data-viewer-app-3.2.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry excluding="**" kind="src" output="target/geoportal-data-viewer-app-3.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
<classpathentry excluding="**" kind="src" output="target/geoportal-data-viewer-app-3.2.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -35,5 +35,5 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/geoportal-data-viewer-app-3.2.0-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/geoportal-data-viewer-app-3.2.1-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.2.0-SNAPSHOT
|
lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.2.1-SNAPSHOT
|
||||||
warSrcDir=src/main/webapp
|
warSrcDir=src/main/webapp
|
||||||
warSrcDirIsOutput=false
|
warSrcDirIsOutput=false
|
||||||
|
|
|
@ -46,7 +46,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-module deploy-name="geoportal-data-viewer-app-3.2.0-SNAPSHOT">
|
|
||||||
|
<wb-module deploy-name="geoportal-data-viewer-app-3.2.1-SNAPSHOT">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -121,6 +123,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -169,6 +172,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -217,6 +221,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -265,6 +270,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -287,6 +293,10 @@
|
||||||
|
|
||||||
|
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||||
|
<dependent-module archiveName="geoportal-data-common-2.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
|
||||||
|
<dependency-type>uses</dependency-type>
|
||||||
|
</dependent-module>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -361,6 +371,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -409,6 +420,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -457,6 +469,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,13 @@
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [v3.2.1-SNAPSHOT] - 2023-02-03
|
||||||
|
|
||||||
|
#### Fixes
|
||||||
|
|
||||||
|
- [#24432] Reverting serialization LinkedHashMap<String, String> to LinkedHashMap<String, Object>.
|
||||||
|
|
||||||
|
|
||||||
## [v3.2.0] - 2023-01-31
|
## [v3.2.0] - 2023-01-31
|
||||||
|
|
||||||
#### Enhancements
|
#### Enhancements
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -14,7 +14,7 @@
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>geoportal-data-viewer-app</artifactId>
|
<artifactId>geoportal-data-viewer-app</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>3.2.0</version>
|
<version>3.2.1-SNAPSHOT</version>
|
||||||
<name>GeoPortal Data Viewer App</name>
|
<name>GeoPortal Data Viewer App</name>
|
||||||
<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the Geoportal projects/documents by a Web-Map Interface</description>
|
<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the Geoportal projects/documents by a Web-Map Interface</description>
|
||||||
|
|
||||||
|
|
|
@ -159,7 +159,7 @@ public interface GeoportalDataViewerService extends RemoteService {
|
||||||
* @param limit the limit
|
* @param limit the limit
|
||||||
* @return the entry sets document for project ID
|
* @return the entry sets document for project ID
|
||||||
*/
|
*/
|
||||||
LinkedHashMap<String, String> getEntrySetsDocumentForProjectID(String profileID, String projectID, int limit);
|
LinkedHashMap<String, Object> getEntrySetsDocumentForProjectID(String profileID, String projectID, int limit);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the relationships for timeline.
|
* Gets the relationships for timeline.
|
||||||
|
|
|
@ -70,7 +70,7 @@ public interface GeoportalDataViewerServiceAsync {
|
||||||
void getInitialConfiguration(AsyncCallback<ViewerConfiguration> callback);
|
void getInitialConfiguration(AsyncCallback<ViewerConfiguration> callback);
|
||||||
|
|
||||||
void getEntrySetsDocumentForProjectID(String profileID, String projectID, int limit,
|
void getEntrySetsDocumentForProjectID(String profileID, String projectID, int limit,
|
||||||
AsyncCallback<LinkedHashMap<String, String>> callback);
|
AsyncCallback<LinkedHashMap<String, Object>> callback);
|
||||||
|
|
||||||
void getRelationshipsForTimeline(String profileID, String projectID, AsyncCallback<List<String>> callback);
|
void getRelationshipsForTimeline(String profileID, String projectID, AsyncCallback<List<String>> callback);
|
||||||
|
|
||||||
|
|
|
@ -930,7 +930,7 @@ public class LayerManager {
|
||||||
intFlex.setCellPadding(1);
|
intFlex.setCellPadding(1);
|
||||||
intFlex.setCellSpacing(1);
|
intFlex.setCellSpacing(1);
|
||||||
if (projectDV.getTheDocument() != null) {
|
if (projectDV.getTheDocument() != null) {
|
||||||
LinkedHashMap<String, String> map = projectDV.getTheDocument().getDocumentAsMap();
|
LinkedHashMap<String, Object> map = projectDV.getTheDocument().getDocumentAsMap();
|
||||||
// my-html-table
|
// my-html-table
|
||||||
// intFlex.getElement().addClassName("my-html-table");
|
// intFlex.getElement().addClassName("my-html-table");
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
@ -1140,7 +1140,7 @@ public class LayerManager {
|
||||||
intFlex.setCellPadding(1);
|
intFlex.setCellPadding(1);
|
||||||
intFlex.setCellSpacing(1);
|
intFlex.setCellSpacing(1);
|
||||||
if (projectDV.getTheDocument() != null) {
|
if (projectDV.getTheDocument() != null) {
|
||||||
LinkedHashMap<String, String> map = projectDV.getTheDocument().getDocumentAsMap();
|
LinkedHashMap<String, Object> map = projectDV.getTheDocument().getDocumentAsMap();
|
||||||
// my-html-table
|
// my-html-table
|
||||||
// intFlex.getElement().addClassName("my-html-table");
|
// intFlex.getElement().addClassName("my-html-table");
|
||||||
// int i = 0;
|
// int i = 0;
|
||||||
|
|
|
@ -14,7 +14,7 @@ public class ProjectUtil {
|
||||||
if (document == null)
|
if (document == null)
|
||||||
return htmlCode;
|
return htmlCode;
|
||||||
|
|
||||||
Entry<String, String> firstEntrySet = document.getFirstEntryOfMap();
|
Entry<String, Object> firstEntrySet = document.getFirstEntryOfMap();
|
||||||
if (firstEntrySet != null) {
|
if (firstEntrySet != null) {
|
||||||
htmlCode += firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b>";
|
htmlCode += firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b>";
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ public class ProjectUtil {
|
||||||
if (document == null)
|
if (document == null)
|
||||||
return htmlCode;
|
return htmlCode;
|
||||||
|
|
||||||
Entry<String, String> firstEntrySet = document.getFirstEntryOfMap();
|
Entry<String, Object> firstEntrySet = document.getFirstEntryOfMap();
|
||||||
if (firstEntrySet != null) {
|
if (firstEntrySet != null) {
|
||||||
htmlCode += showkey ? firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b>"
|
htmlCode += showkey ? firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b>"
|
||||||
: firstEntrySet.getValue();
|
: firstEntrySet.getValue();
|
||||||
|
@ -51,7 +51,7 @@ public class ProjectUtil {
|
||||||
if (document == null)
|
if (document == null)
|
||||||
return htmlCode;
|
return htmlCode;
|
||||||
|
|
||||||
Entry<String, String> firstEntrySet = document.getFirstEntryOfMap();
|
Entry<String, Object> firstEntrySet = document.getFirstEntryOfMap();
|
||||||
if (firstEntrySet != null) {
|
if (firstEntrySet != null) {
|
||||||
htmlCode += firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b>";
|
htmlCode += firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b>";
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,7 +121,7 @@ public class ViewRelationshipPanel extends Composite {
|
||||||
firstProjectPanelContainer.clear();
|
firstProjectPanelContainer.clear();
|
||||||
secondProjectPanelContainer.clear();
|
secondProjectPanelContainer.clear();
|
||||||
|
|
||||||
Entry<String, String> firstEntrySet = project.getTheDocument().getFirstEntryOfMap();
|
Entry<String, Object> firstEntrySet = project.getTheDocument().getFirstEntryOfMap();
|
||||||
String htmlMsg = firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b> (id: " + project.getId()
|
String htmlMsg = firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b> (id: " + project.getId()
|
||||||
+ ")";
|
+ ")";
|
||||||
|
|
||||||
|
|
|
@ -101,10 +101,10 @@ public class DragDropLayer extends FlowPanel {
|
||||||
labelProject.setTitle(referProjectID);
|
labelProject.setTitle(referProjectID);
|
||||||
GeoportalDataViewerServiceAsync.Util.getInstance().getEntrySetsDocumentForProjectID(
|
GeoportalDataViewerServiceAsync.Util.getInstance().getEntrySetsDocumentForProjectID(
|
||||||
layerObject.getProjectDV().getProfileID(), layerObject.getProjectDV().getId(), 1,
|
layerObject.getProjectDV().getProfileID(), layerObject.getProjectDV().getId(), 1,
|
||||||
new AsyncCallback<LinkedHashMap<String, String>>() {
|
new AsyncCallback<LinkedHashMap<String, Object>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(LinkedHashMap<String, String> result) {
|
public void onSuccess(LinkedHashMap<String, Object> result) {
|
||||||
String realProjectName = "";
|
String realProjectName = "";
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
for (String key : result.keySet()) {
|
for (String key : result.keySet()) {
|
||||||
|
|
|
@ -1111,7 +1111,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
|
||||||
if (layerObject.getProjectDV().getTheDocument() == null) {
|
if (layerObject.getProjectDV().getTheDocument() == null) {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
LinkedHashMap<String, String> documentAsMap = getEntrySetsDocumentForProjectID(
|
LinkedHashMap<String, Object> documentAsMap = getEntrySetsDocumentForProjectID(
|
||||||
layerObject.getProfileID(), layerObject.getProjectID(), 1);
|
layerObject.getProfileID(), layerObject.getProjectID(), 1);
|
||||||
DocumentDV documentDV = new DocumentDV();
|
DocumentDV documentDV = new DocumentDV();
|
||||||
documentDV.setDocumentAsMap(documentAsMap);
|
documentDV.setDocumentAsMap(documentAsMap);
|
||||||
|
@ -1207,7 +1207,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
|
||||||
});
|
});
|
||||||
|
|
||||||
if (loadDocument) {
|
if (loadDocument) {
|
||||||
LinkedHashMap<String, String> theDocument = getEntrySetsDocumentForProjectID(profileID, projectID,
|
LinkedHashMap<String, Object> theDocument = getEntrySetsDocumentForProjectID(profileID, projectID,
|
||||||
limitDocumentEntries);
|
limitDocumentEntries);
|
||||||
DocumentDV docDV = new DocumentDV();
|
DocumentDV docDV = new DocumentDV();
|
||||||
docDV.setDocumentAsMap(theDocument);
|
docDV.setDocumentAsMap(theDocument);
|
||||||
|
@ -1256,11 +1256,11 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme
|
||||||
* @return the entry sets document for project ID
|
* @return the entry sets document for project ID
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public LinkedHashMap<String, String> getEntrySetsDocumentForProjectID(String profileID, String projectID,
|
public LinkedHashMap<String, Object> getEntrySetsDocumentForProjectID(String profileID, String projectID,
|
||||||
int limit) {
|
int limit) {
|
||||||
LOG.debug("called getEntrySetsDocumentForProjectID for profileID: " + profileID + ", projectID: " + projectID);
|
LOG.debug("called getEntrySetsDocumentForProjectID for profileID: " + profileID + ", projectID: " + projectID);
|
||||||
|
|
||||||
LinkedHashMap<String, String> documentAsMap = new LinkedHashMap<String, String>(limit);
|
LinkedHashMap<String, Object> documentAsMap = new LinkedHashMap<String, Object>(limit);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue