Ate Douma pushed to branch feature/translations-psp1 at cms / hippo-cms
Commits:
033b7f4d by Ate Douma at 2016-02-15T23:55:05+01:00
CMS-16 fix more merge errors
- - - - -
3 changed files:
-
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/open/OpenDialog.java
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java
- pom.xml
Changes:
=====================================
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/open/OpenDialog.java
=====================================
---
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/open/OpenDialog.java
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/open/OpenDialog.java
@@ -55,7 +55,7 @@ public class OpenDialog extends AbstractDialog<Node> {
public OpenDialog(final NodeModelReference modelReference) {
this.modelReference = modelReference;
- IModel<String> labelModel = new Model<>("Path/UUID");
+ IModel<String> labelModel = new Model<>("Path or UUID");
add(new Label("label", labelModel));
add(setFocus(makeValueField(getValueCurrentlySelectedJcrNode())));
}
@@ -205,7 +205,7 @@ public class OpenDialog extends AbstractDialog<Node> {
@Override
public IModel getTitle() {
- return new Model<String>("Open node by path or id");
+ return new Model<String>("Open node by path or UUID");
}
@Override
=====================================
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java
=====================================
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java
@@ -67,8 +67,6 @@ import org.slf4j.LoggerFactory;
public abstract class AbstractFieldPlugin<P extends Item, C extends IModel>
extends ListViewPlugin<Node> implements
ITemplateFactory<C> {
- private static final long serialVersionUID = 1L;
-
private static final String CLUSTER_OPTIONS = "cluster.options";
private static final String MAX_ITEMS = "maxitems";
@@ -79,8 +77,6 @@ public abstract class AbstractFieldPlugin<P extends Item, C
extends IModel> exte
private IPluginConfig parameters;
abstract static class ValidationFilter extends Model<String> {
- private static final long serialVersionUID = 1L;
-
private static final String INVALID = "invalid";
private boolean valid = true;
@@ -135,8 +131,6 @@ public abstract class AbstractFieldPlugin<P extends Item, C
extends IModel> exte
helper = new FieldPluginHelper(context, config);
if (helper.getValidationModel() != null && helper.getValidationModel()
instanceof IObservable) {
context.registerService(new Observer<IObservable>((IObservable)
helper.getValidationModel()) {
- private static final long serialVersionUID = 1L;
-
public void onEvent(Iterator events) {
for (ValidationFilter listener : new
ArrayList<>(listeners.values())) {
IValidationResult validationResult =
helper.getValidationModel().getObject();
@@ -187,8 +181,6 @@ public abstract class AbstractFieldPlugin<P extends Item, C
extends IModel> exte
IFieldDescriptor field = helper.getField();
if (field != null && !doesTemplateSupportValidation()) {
filter = new ValidationFilter() {
- private static final long serialVersionUID = 1L;
-
@Override
public void onValidation(IValidationResult validation) {
// nothing; is updated on render
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -397,6 +397,7 @@
<exclude>console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/tree/tree.css</exclude>
<!-- forked from Apache Tomcat sources -->
<exclude>engine/src/main/java/org/hippoecm/frontend/custom/ServerCookie.java</exclude>
+
<exclude>engine/src/main/java/org/hippoecm/frontend/http/CsrfPreventionRequestCycleListener.java</exclude>
<!-- external contributions -->
<exclude>gotolink/src/test/java/org/hippoecm/frontend/plugins/gotolink/GotolinkDocumentsShortcutPluginTest.java</exclude>
<exclude>gotolink/src/test/java/org/hippoecm/frontend/plugins/gotolink/MyHomePage.java</exclude>
View it on GitLab:
https://code.onehippo.org/cms/hippo-cms/commit/033b7f4d70189dc6a9078809f028d0dba5e20173
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
