You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/26 09:10:02 UTC
[isis] branch master updated: ISIS-2297: remove debug code
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c47d0cc192 ISIS-2297: remove debug code
c47d0cc192 is described below
commit c47d0cc192b7ee921a30f0821266058320f66317
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Apr 26 11:09:55 2022 +0200
ISIS-2297: remove debug code
---
.../scalars/ScalarPanelSelectAbstract.java | 35 +---------------------
.../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 6 ++--
2 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
index c55de55f28..c7689a3150 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
@@ -26,14 +26,11 @@ import org.apache.wicket.model.Model;
import org.springframework.lang.Nullable;
import org.wicketstuff.select2.ChoiceProvider;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.debug._Debug;
import org.apache.isis.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.viewer.common.model.feature.ParameterUiModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
-import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.Wkt.EventTopic;
@@ -113,37 +110,7 @@ extends ScalarPanelFormFieldAbstract<ManagedObject> {
if (select2 == null) {
return false;
}
-
- final ChoiceProvider<ObjectMemento> choiceProvider = buildChoiceProvider();
- select2.setProvider(choiceProvider);
-
- //sets up the choices, also ensuring that any currently held value is compatible.
-
- _Casts.castTo(ObjectAdapterMementoProviderAbstract.class, choiceProvider)
- .ifPresent(mementoProvider->{
- if(mementoProvider.dependsOnPreviousArgs()){
-
- _Debug.log("ChoiceProvider with DependsOnPreviousArgs while scalarModel() %s",
- scalarModel().isEmpty()? "is empty" : "is not empty");
-
- System.err.printf("ChoiceProvider with DependsOnPreviousArgs while scalarModel() %s%n",
- scalarModel().isEmpty()? "is empty" : "is not empty");
-
- //XXX what to do?
-// if(scalarModel().isScalar()) {
-// if(select2.isEmpty()) {
-// select2.clear(); // why?
-// getModel().setObject(null);
-// }
-// }
-//
-// if(scalarModel().isEmpty()) {
-// select2.clear();
-// }
-
- }
- });
-
+ select2.setProvider(buildChoiceProvider());
return true;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
index c3a901f040..b0ff4dfd09 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
@@ -567,7 +567,6 @@ public class Wkt {
private static final long serialVersionUID = 1L;
@Override public MarkupContainer add(final Component... children) {
for(var child:children) {
-
System.err.printf("add %s -> %s %n", this.getId(), child.getId());
}
return super.add(children); }
@@ -974,9 +973,8 @@ public class Wkt {
if(formComponent instanceof TextArea) {
multilineNumberOfLines.get()
- .ifPresent(numberOfLines->{
- System.err.printf("%d%n", numberOfLines);
- Wkt.attributeReplace(formComponent, "rows", numberOfLines);});
+ .ifPresent(numberOfLines->
+ Wkt.attributeReplace(formComponent, "rows", numberOfLines));
}
maxLength.get()