Compare commits
1 Commits
master
...
with_final
| Author | SHA1 | Date |
|---|---|---|
 Francesco Mangiacrapa
|
5ca842bfb4 |
|
|
@ -1,5 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -79,7 +82,10 @@
|
|||
|
||||
|
||||
<wb-module deploy-name="geoportal-data-entry-app-3.0.1">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -159,7 +165,10 @@
|
|||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -239,7 +248,10 @@
|
|||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -319,7 +331,10 @@
|
|||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -351,7 +366,10 @@
|
|||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -431,7 +449,10 @@
|
|||
|
||||
|
||||
<property name="context-root" value="geoportal-data-entry-app"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -511,7 +532,10 @@
|
|||
|
||||
|
||||
<property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -591,7 +615,10 @@
|
|||
|
||||
|
||||
</wb-module>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
<properties>
|
||||
<!-- Convenience property to set the GWT version -->
|
||||
<gwt.version>2.9.0</gwt.version>
|
||||
<gwt.version>2.10.0</gwt.version>
|
||||
<!-- GWT needs at least java 1.6 -->
|
||||
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
|
||||
private TreeItemPanel treeItemPanel;
|
||||
|
||||
private GeoPortalClientCaches geoportalCaches;
|
||||
private final GeoPortalClientCaches geoportalCaches = new GeoPortalClientCaches();
|
||||
|
||||
/**
|
||||
* This is the entry point method.
|
||||
|
|
@ -175,7 +175,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
* TreeItemPanel tip = new TreeItemPanel("Concessione", gnaCardsModels);
|
||||
* RootPanel.get(GeoPortalDataEntryApp.DIV_PORTLET_ID).add(tip.getTree());
|
||||
*/
|
||||
geoportalCaches = new GeoPortalClientCaches();
|
||||
|
||||
|
||||
ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.getElement()
|
||||
.addClassName(ConstantsGeoPortalDataEntryApp.CSS_CLASS_GEOPORTAL_LOADERS_CENTER);
|
||||
|
|
@ -382,7 +382,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
|
||||
}
|
||||
|
||||
private void createNewDataEntyFor(String profileID, HandlerDeclarationDV handlerDeclarationDV,
|
||||
private void createNewDataEntyFor(final String profileID, final HandlerDeclarationDV handlerDeclarationDV,
|
||||
List<GcubeProfileDV> listGPs) {
|
||||
dataEntryProjectCreated = true;
|
||||
mainTabPanel.setLoaderVisible("Loading...", true);
|
||||
|
|
@ -405,10 +405,10 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
numberOfCards = 0;
|
||||
expectedCards = listGPs.size();
|
||||
GWT.log("expectedCards are: " + expectedCards);
|
||||
TreeMap<Integer, GeoNaFormCardModel> treemapOrderedGNAProfiles = new TreeMap<Integer, GeoNaFormCardModel>();
|
||||
final TreeMap<Integer, GeoNaFormCardModel> treemapOrderedGNAProfiles = new TreeMap<Integer, GeoNaFormCardModel>();
|
||||
|
||||
for (int i = 0; i < expectedCards; i++) {
|
||||
GcubeProfileDV gcubeProfile = listGPs.get(i);
|
||||
final GcubeProfileDV gcubeProfile = listGPs.get(i);
|
||||
final int order = i;
|
||||
GWT.log("calling getProfilesInTheScope for secondaryType: " + gcubeProfile.getGcubeSecondaryType()
|
||||
+ ", name: " + gcubeProfile.getGcubeName());
|
||||
|
|
@ -714,7 +714,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
appManagerBus.addHandler(CreateNewProjectEvent.TYPE, new CreateNewProjectEventHandler() {
|
||||
|
||||
@Override
|
||||
public void onCreateNewProject(CreateNewProjectEvent newProjectEvent) {
|
||||
public void onCreateNewProject(final CreateNewProjectEvent newProjectEvent) {
|
||||
GWT.log("Create new project");
|
||||
if (!dataEntryProjectCreated) {
|
||||
createNewDataEntyFor(newProjectEvent.getProfileID(), newProjectEvent.getHandler(),
|
||||
|
|
@ -725,7 +725,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
// means the form was not submitted
|
||||
if (savedMap.size() == 0) {
|
||||
|
||||
ModalConfirm confirm = new ModalConfirm(null, "Creating New Project...",
|
||||
final ModalConfirm confirm = new ModalConfirm(null, "Creating New Project...",
|
||||
"The current project (is not saved) and will be lost. Confirm?");
|
||||
|
||||
confirm.getYesButton().addClickHandler(new ClickHandler() {
|
||||
|
|
@ -748,7 +748,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
newProjectEvent.getListGcubeProfiles());
|
||||
} else {
|
||||
|
||||
ModalConfirm confirm = new ModalConfirm(null, "Creating New Project...",
|
||||
final ModalConfirm confirm = new ModalConfirm(null, "Creating New Project...",
|
||||
"The data entry form/s will be cleaned. Confirm?");
|
||||
|
||||
confirm.getYesButton().addClickHandler(new ClickHandler() {
|
||||
|
|
@ -857,7 +857,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
appManagerBus.addHandler(RelationActionHandlerEvent.TYPE, new RelationActionHandler() {
|
||||
|
||||
@Override
|
||||
public void onCreateRelation(RelationActionHandlerEvent createRelationHE) {
|
||||
public void onCreateRelation(final RelationActionHandlerEvent createRelationHE) {
|
||||
|
||||
if (createRelationHE.getRelactionActionType() == null)
|
||||
return;
|
||||
|
|
@ -901,10 +901,10 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
modal.setTitle("Deleting relationship...");
|
||||
modal.setWidth(800);
|
||||
modal.setCloseVisible(false);
|
||||
String fromProfileID = createRelationHE.getFromProject().getProfileID();
|
||||
String fromProjectID = createRelationHE.getFromProject().getId();
|
||||
String toProfileID = createRelationHE.getToProject().getProfileID();
|
||||
String toProjectID = createRelationHE.getToProject().getId();
|
||||
final String fromProfileID = createRelationHE.getFromProject().getProfileID();
|
||||
final String fromProjectID = createRelationHE.getFromProject().getId();
|
||||
final String toProfileID = createRelationHE.getToProject().getProfileID();
|
||||
final String toProjectID = createRelationHE.getToProject().getId();
|
||||
final VerticalPanel modalContainerPanel = new VerticalPanel();
|
||||
final LoaderIcon loader = new LoaderIcon("Trying to delete the relation " + relationName
|
||||
+ " from Project ID: " + fromProjectID + " to Project ID: " + toProjectID);
|
||||
|
|
@ -961,7 +961,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
// rtth.showAsJSON(false);
|
||||
// modal.add(rtth);
|
||||
|
||||
List<DocumentDV> listDocuments = Arrays.asList(result);
|
||||
List<DocumentDV> listDocuments = Arrays.asList((DocumentDV) result);
|
||||
|
||||
appManagerBus.fireEvent(new OperationOnItemEvent<DocumentDV>(listDocuments,
|
||||
OPERATION_ON_ITEM.VIEW_RELATIONSHIPS));
|
||||
|
|
@ -1021,10 +1021,10 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
modal.setWidth(800);
|
||||
modal.setCloseVisible(false);
|
||||
final RelationshipDefinitionDV relationSelected = createRelationHE.getRelationSelected();
|
||||
String fromProfileID = createRelationHE.getFromProject().getProfileID();
|
||||
String fromProjectID = createRelationHE.getFromProject().getId();
|
||||
String toProfileID = createRelationHE.getToProject().getProfileID();
|
||||
String toProjectID = createRelationHE.getToProject().getId();
|
||||
final String fromProfileID = createRelationHE.getFromProject().getProfileID();
|
||||
final String fromProjectID = createRelationHE.getFromProject().getId();
|
||||
final String toProfileID = createRelationHE.getToProject().getProfileID();
|
||||
final String toProjectID = createRelationHE.getToProject().getId();
|
||||
final VerticalPanel modalContainerPanel = new VerticalPanel();
|
||||
final LoaderIcon loader = new LoaderIcon(
|
||||
"Trying to create the relation " + relationSelected.getLabel()
|
||||
|
|
@ -1224,8 +1224,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onSuccess(
|
||||
ResultDocumentDV theResultDocument) {
|
||||
public void onSuccess(final ResultDocumentDV theResultDocument) {
|
||||
VerticalPanel vp = new VerticalPanel();
|
||||
vp.getElement().getStyle().setMarginTop(20,
|
||||
Unit.PX);
|
||||
|
|
@ -1245,7 +1244,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
|||
appManagerBus.fireEvent(
|
||||
new OperationOnItemEvent<DocumentDV>(
|
||||
Arrays.asList(
|
||||
theResultDocument),
|
||||
(DocumentDV) theResultDocument),
|
||||
OPERATION_ON_ITEM.VIEW_REPORT));
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -411,7 +411,7 @@ public class GeonaMainTabPanel extends Composite {
|
|||
*
|
||||
* @param listUCDescriptors the list UC descriptors
|
||||
*/
|
||||
public void initMainAccordingToListUseCaseDescriptors(List<UseCaseDescriptorDV> listUCDescriptors) {
|
||||
public void initMainAccordingToListUseCaseDescriptors(final List<UseCaseDescriptorDV> listUCDescriptors) {
|
||||
GWT.log("initMainAccordingToListUseCaseDescriptors: " + listUCDescriptors);
|
||||
// this.listUCDescriptors = listUCDescriptors;
|
||||
ddCreateNewProject.clear();
|
||||
|
|
@ -421,11 +421,11 @@ public class GeonaMainTabPanel extends Composite {
|
|||
|
||||
for (final UseCaseDescriptorDV ucd : listUCDescriptors) {
|
||||
|
||||
HandlerDeclarationDV dataEntryHandler = UCD_Util.getHandlerDeclarationFor(ucd,
|
||||
final HandlerDeclarationDV dataEntryHandler = UCD_Util.getHandlerDeclarationFor(ucd,
|
||||
GEOPORTAL_DATA_HANDLER.geoportal_data_entry);
|
||||
|
||||
if (dataEntryHandler != null) {
|
||||
ConfigurationDV<?> config = dataEntryHandler.getConfiguration();
|
||||
final ConfigurationDV<?> config = dataEntryHandler.getConfiguration();
|
||||
List<GcubeProfileDV> listGcubeProfiles = toListGcubeProfiles(config);
|
||||
|
||||
final List<GcubeProfileDV> listProfiles = listGcubeProfiles;
|
||||
|
|
@ -487,7 +487,7 @@ public class GeonaMainTabPanel extends Composite {
|
|||
@Override
|
||||
public void execute() {
|
||||
GWT.log("One Config loaded. Firing CreateNewProjectEvent");
|
||||
UseCaseDescriptorDV useCaseDescriptor = listUCDescriptors.get(0);
|
||||
final UseCaseDescriptorDV useCaseDescriptor = listUCDescriptors.get(0);
|
||||
HandlerDeclarationDV dataEntryHandler = UCD_Util.getHandlerDeclarationFor(useCaseDescriptor,
|
||||
GEOPORTAL_DATA_HANDLER.geoportal_data_entry);
|
||||
if (dataEntryHandler != null) {
|
||||
|
|
|
|||
|
|
@ -33,6 +33,12 @@ public class ActionListPanel extends Composite {
|
|||
interface ActionListPanelUiBinder extends UiBinder<Widget, ActionListPanel> {
|
||||
}
|
||||
|
||||
@UiField
|
||||
HTMLPanel actionListContainer;
|
||||
|
||||
@UiField
|
||||
HTMLPanel actionListBasePanel;
|
||||
|
||||
private String projectName;
|
||||
private String profileID;
|
||||
private List<ActionDefinitionDV> listActionDefinition;
|
||||
|
|
@ -50,15 +56,9 @@ public class ActionListPanel extends Composite {
|
|||
actionListBasePanel.setVisible(false);
|
||||
}
|
||||
|
||||
@UiField
|
||||
HTMLPanel actionListContainer;
|
||||
|
||||
@UiField
|
||||
HTMLPanel actionListBasePanel;
|
||||
|
||||
private Map<String, List<ActionDefButton>> mapPhaseListButtons;
|
||||
|
||||
private void initActions(List<ActionDefinitionDV> listActionDef) {
|
||||
private void initActions(final List<ActionDefinitionDV> listActionDef) {
|
||||
|
||||
if (listActionDef.size() > 0) {
|
||||
// actionListBasePanel.setVisible(true);
|
||||
|
|
@ -68,7 +68,7 @@ public class ActionListPanel extends Composite {
|
|||
|
||||
mapPhaseListButtons = new LinkedHashMap<String, List<ActionDefButton>>();
|
||||
|
||||
for (ActionDefinitionDV actionDefinitionDV : listActionDef) {
|
||||
for (final ActionDefinitionDV actionDefinitionDV : listActionDef) {
|
||||
|
||||
// skipping the special workflow action
|
||||
if (actionDefinitionDV.getId()
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ public class GeonaDataEntryMainForm extends Composite {
|
|||
*
|
||||
* @param appManagerBus the app manager bus
|
||||
*/
|
||||
public GeonaDataEntryMainForm(HandlerManager appManagerBus) {
|
||||
public GeonaDataEntryMainForm(final HandlerManager appManagerBus) {
|
||||
initWidget(uiBinder.createAndBindUi(this));
|
||||
this.appManagerBus = appManagerBus;
|
||||
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ public class ListOfProjectTablePanel extends Composite {
|
|||
* @param ucdProjectTypesForListingDataView the ucd project types for listing
|
||||
* data view
|
||||
*/
|
||||
public void instanceAndShowListOfProjects(List<UseCaseDescriptorDV> ucdProjectTypesForListingDataView) {
|
||||
public void instanceAndShowListOfProjects(final List<UseCaseDescriptorDV> ucdProjectTypesForListingDataView) {
|
||||
GWT.log("ListOfProjectTablePanel instanceAndShowListOfProjects called");
|
||||
this.ucdProjectTypesForListingDataView = ucdProjectTypesForListingDataView;
|
||||
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ public class CreateRelationProjectsPanel extends Composite {
|
|||
|
||||
private HandlerManager appManagerBus;
|
||||
|
||||
public CreateRelationProjectsPanel(HandlerManager appManagerBus, ResultDocumentDV project) {
|
||||
public CreateRelationProjectsPanel(final HandlerManager appManagerBus, final ResultDocumentDV project) {
|
||||
initWidget(uiBinder.createAndBindUi(this));
|
||||
this.appManagerBus = appManagerBus;
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ public class ViewRelationshipPanel extends Composite {
|
|||
|
||||
private ResultDocumentDV fromTheProject;
|
||||
|
||||
public ViewRelationshipPanel(HandlerManager appManagerBus, final ResultDocumentDV fromProject, boolean showExpand) {
|
||||
public ViewRelationshipPanel(final HandlerManager appManagerBus, final ResultDocumentDV fromProject, final boolean showExpand) {
|
||||
initWidget(uiBinder.createAndBindUi(this));
|
||||
this.appManagerBus = appManagerBus;
|
||||
this.fromTheProject = fromProject;
|
||||
|
|
@ -135,7 +135,7 @@ public class ViewRelationshipPanel extends Composite {
|
|||
showRelationsOf(fromProject);
|
||||
}
|
||||
|
||||
public void showRelationsOf(ResultDocumentDV project) {
|
||||
public void showRelationsOf(final ResultDocumentDV project) {
|
||||
firstProjectPanelContainer.clear();
|
||||
secondProjectPanelContainer.clear();
|
||||
this.fromTheProject = project;
|
||||
|
|
@ -163,7 +163,7 @@ public class ViewRelationshipPanel extends Composite {
|
|||
|
||||
secondProjectPanelContainer.clear();
|
||||
|
||||
for (RelationshipDV relationDV : project.getListRelationshipDV()) {
|
||||
for (final RelationshipDV relationDV : project.getListRelationshipDV()) {
|
||||
|
||||
final FlexTable flexTable = new FlexTable();
|
||||
flexTable.getElement().addClassName("box-table-diplay-project");
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
|
|||
|
||||
int i = 1;
|
||||
|
||||
for (ItemFieldDV itemField : displayFields) {
|
||||
for (final ItemFieldDV itemField : displayFields) {
|
||||
|
||||
if (i > ConstantsGeoPortalDataEntryApp.MAX_COLUMN_DISPLAYED_IN_THE_TABLE) {
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public class TreeItemPanel {
|
|||
*/
|
||||
// Create a tree
|
||||
public TreeItemPanel(String profileID, String itemTypeTitle, Collection<GeoNaFormCardModel> gnaCardsModels,
|
||||
HandlerManager appManagerBus) {
|
||||
final HandlerManager appManagerBus) {
|
||||
this.appManagerBus = appManagerBus;
|
||||
this.itemTypeTitle = itemTypeTitle;
|
||||
this.profileID = profileID;
|
||||
|
|
|
|||
Loading…
Reference in New Issue