diff --git a/src/de/cses/client/MainView.java b/src/de/cses/client/MainView.java index fdfe7963..6c801b77 100644 --- a/src/de/cses/client/MainView.java +++ b/src/de/cses/client/MainView.java @@ -18,7 +18,6 @@ import com.google.gwt.event.logical.shared.CloseHandler; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.resources.client.ClientBundle.Source; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Label; @@ -74,7 +73,7 @@ interface Resources extends ClientBundle { } // this footer will be shown at the bottom of the WebApp - private static final String FOOTER_TEXT = "\u00A9 2019 Sächsische Akademie der Wissenschaften zu Leipzig (Version 0.9.4)"; + private static final String FOOTER_TEXT = "\u00A9 2019 Sächsische Akademie der Wissenschaften zu Leipzig (Version 1.0 RC1)"; private BorderLayoutContainer view = null; private CaveSearchController caveSearchController; @@ -222,8 +221,8 @@ public void onSelect(SelectEvent event) { // ----------------------------------- assembling the menu bar --------------------------------------------- selectorLayoutContainer = new HorizontalLayoutContainer(); - selectorLayoutContainer.add(kuchaLogo, new HorizontalLayoutData(159, 91, new Margins(0))); - selectorLayoutContainer.add(caveSearchController, new HorizontalLayoutData(90, 90, new Margins(10))); + selectorLayoutContainer.add(kuchaLogo, new HorizontalLayoutData(159, 100, new Margins(5, 0, 5, 0))); + selectorLayoutContainer.add(caveSearchController, new HorizontalLayoutData(130, 90, new Margins(10, 10, 10, 50))); selectorLayoutContainer.add(depictionSearchController, new HorizontalLayoutData(90, 90, new Margins(10))); selectorLayoutContainer.add(ornamenticSearchController, new HorizontalLayoutData(90, 90, new Margins(10))); selectorLayoutContainer.add(annotatedBiblographySearchController, new HorizontalLayoutData(90, 90, new Margins(10))); diff --git a/src/de/cses/client/ornamentic/OrnamentCaveRelationEditor.java b/src/de/cses/client/ornamentic/OrnamentCaveRelationEditor.java index d5f83b0e..5557f7e6 100644 --- a/src/de/cses/client/ornamentic/OrnamentCaveRelationEditor.java +++ b/src/de/cses/client/ornamentic/OrnamentCaveRelationEditor.java @@ -318,7 +318,7 @@ public void onClick(ClickEvent event) { header = new FramedPanel(); HorizontalPanel selectedWallsHorizontalPanel = new HorizontalPanel(); - header.setHeading("Walls"); + header.setHeading("Position in Caves"); header.add(selectedWallsHorizontalPanel, new VerticalLayoutData(1.0, 1.0)); vlcCave.add(header, new VerticalLayoutData(0.5, .125)); @@ -465,7 +465,7 @@ public void onClick(ClickEvent event) { header.setHeading("Select related ornaments"); header.add(relatedOrnamentsHorizontalPanel); - vlcRelationToTherornaments1.add(header, new VerticalLayoutData(1.0, .4)); + vlcRelationToTherornaments1.add(header, new VerticalLayoutData(1.0, .5)); HorizontalLayoutContainer similarOrnamentsHorizontalPanel = new HorizontalLayoutContainer(); ListView ornamentListViewSimilar = new ListView( @@ -499,17 +499,17 @@ public void onClick(ClickEvent event) { groupOfOrnaments.setText(ornamentCaveRelationEntry.getGroup()); } header.add(groupOfOrnaments); - vlcRelationToTherornaments1.add(header, new VerticalLayoutData(1, .125)); + vlcRelationToTherornaments1.add(header, new VerticalLayoutData(1, .5)); final TextArea similarElementsofOtherCultures = new TextArea(); - header = new FramedPanel(); - if (ornamentCaveRelationEntry != null) { - similarElementsofOtherCultures.setText(ornamentCaveRelationEntry.getSimilarelementsOfOtherCultures()); - } - header.setHeading("Similarities with elements of other cultural areas"); - header.add(similarElementsofOtherCultures); - vlcRelationToTherornaments1.add(header, new VerticalLayoutData(1, .3)); +// header = new FramedPanel(); +// if (ornamentCaveRelationEntry != null) { +// similarElementsofOtherCultures.setText(ornamentCaveRelationEntry.getSimilarelementsOfOtherCultures()); +// } +// header.setHeading("Similarities with elements of other cultural areas"); +// header.add(similarElementsofOtherCultures); +// vlcRelationToTherornaments1.add(header, new VerticalLayoutData(1, .3)); tabPanel.add(relationToOtherOrnamentsHLC, "Relations"); diff --git a/src/de/cses/client/ornamentic/OrnamenticEditor.java b/src/de/cses/client/ornamentic/OrnamenticEditor.java index a3614d80..2dc1caf0 100644 --- a/src/de/cses/client/ornamentic/OrnamenticEditor.java +++ b/src/de/cses/client/ornamentic/OrnamenticEditor.java @@ -289,7 +289,7 @@ public SafeHtml render(OrnamentClassEntry item) { }); header = new FramedPanel(); - header.setHeading("Ornament Motif"); + header.setHeading("Motif"); ornamentClassComboBox.setTriggerAction(TriggerAction.ALL); header.add(ornamentClassComboBox); panel.add(header, new VerticalLayoutData(1.0, .125)); @@ -439,7 +439,7 @@ public void onSuccess(OrnamentClassEntry result) { remarks = new TextArea(); remarks.setAllowBlank(true); header = new FramedPanel(); - header.setHeading("Remarks"); + header.setHeading("General Remarks"); header.add(remarks); panel.add(header, new VerticalLayoutData(1.0, .3)); if (ornamentEntry != null) { @@ -956,7 +956,7 @@ public void onSelect(SelectEvent event) { horiPanel.setSize("650", "600"); backgroundPanel.add(horiPanel); horiPanel.add(tabpanel); - backgroundPanel.setHeading("Ornamentic Editor"); + backgroundPanel.setHeading("Ornamentation Editor"); backgroundPanel.addTool(saveButton); backgroundPanel.addTool(closeButton); diff --git a/src/de/cses/client/ornamentic/OrnamenticFilter.java b/src/de/cses/client/ornamentic/OrnamenticFilter.java index 7101d918..e7f64a99 100644 --- a/src/de/cses/client/ornamentic/OrnamenticFilter.java +++ b/src/de/cses/client/ornamentic/OrnamenticFilter.java @@ -836,7 +836,7 @@ public SafeHtml render(OrnamentClassEntry item) { }); ContentPanel headerOrnamentClass = new ContentPanel(); - headerOrnamentClass.setHeading("Ornament Motif"); + headerOrnamentClass.setHeading("Motif"); ornamentClassComboBox.setTriggerAction(TriggerAction.ALL); headerOrnamentClass.add(ornamentClassComboBox); headerOrnamentClass.getHeader().setStylePrimaryName("frame-header"); diff --git a/src/de/cses/client/ornamentic/WallOrnamentCaveRelationEditor.java b/src/de/cses/client/ornamentic/WallOrnamentCaveRelationEditor.java index 37ee1073..a3c04635 100644 --- a/src/de/cses/client/ornamentic/WallOrnamentCaveRelationEditor.java +++ b/src/de/cses/client/ornamentic/WallOrnamentCaveRelationEditor.java @@ -135,7 +135,7 @@ public SafeHtml render(OrnamentPositionEntry item) { ornamentPositionComboBox.setTriggerAction(TriggerAction.ALL); FramedPanel ornamentPositionFP = new FramedPanel(); - ornamentPositionFP.setHeading("Select ornament position"); + ornamentPositionFP.setHeading("Select position"); ornamentPositionFP.add(ornamentPositionComboBox); ornamentfunctionComboBox = new ComboBox(ornamentFunctionEntryLS, ornamentFunctionProps.name(), @@ -151,7 +151,7 @@ public SafeHtml render(OrnamentFunctionEntry item) { ornamentfunctionComboBox.setEditable(false); ornamentfunctionComboBox.setTriggerAction(TriggerAction.ALL); FramedPanel ornamentFunctionFP = new FramedPanel(); - ornamentFunctionFP.setHeading("Select the ornament function"); + ornamentFunctionFP.setHeading("Select function"); ornamentFunctionFP.add(ornamentfunctionComboBox); ValueChangeHandler positionSelectionHandler = new ValueChangeHandler() { @@ -203,7 +203,7 @@ public void onSuccess(ArrayList result) { wallRelationHLC.add(vlcWalls, new HorizontalLayoutData(.5, 1.0)); FramedPanel wallrelationFramedPanel = new FramedPanel(); - wallrelationFramedPanel.setHeading("Select Walls"); + wallrelationFramedPanel.setHeading("Add Position in Cave"); wallrelationFramedPanel.setSize("600px", "450px"); wallrelationFramedPanel.add(wallRelationHLC); diff --git a/src/de/cses/server/mysql/MysqlConnector.java b/src/de/cses/server/mysql/MysqlConnector.java index 15316dd4..6ddbf3b3 100644 --- a/src/de/cses/server/mysql/MysqlConnector.java +++ b/src/de/cses/server/mysql/MysqlConnector.java @@ -481,7 +481,11 @@ public ArrayList searchImages(ImageSearchEntry searchEntry) { if (where.startsWith("AccessLevel") && results.size() > 100) { // when there is not filter option selected the where clause only deals with AccessLevel // limiting the number of search results to avoid slowing down the system - return (ArrayList) results.subList(0, 100); + ArrayList subResultList = new ArrayList(); + for (ImageEntry ie : results.subList(0, 100)) { + subResultList.add(ie); + } + return subResultList; } return results; }