Author: sebawagner
Date: Tue Sep 18 17:39:02 2012
New Revision: 1387277
URL: http://svn.apache.org/viewvc?rev=1387277&view=rev
Log:
OPENMEETINGS-428 make code more lean
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1387277&r1=1387276&r2=1387277&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
Tue Sep 18 17:39:02 2012
@@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
public class ConfigsPanel extends AdminPanel {
@@ -58,14 +57,7 @@ public class ConfigsPanel extends AdminP
target.add(form);
}
});
- item.add(AttributeModifier.replace("class", new
AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return (item.getIndex() % 2 == 1) ? "even" : "odd";
- }
- }));
+ item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java?rev=1387277&r1=1387276&r2=1387277&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
Tue Sep 18 17:39:02 2012
@@ -32,7 +32,6 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
@@ -80,14 +79,7 @@ public class GroupsPanel extends AdminPa
target.add(form);
}
});
- item.add(AttributeModifier.replace("class", new
AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return (item.getIndex() % 2 == 1) ? "even" : "odd";
- }
- }));
+ item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
dataView.setItemsPerPage(8); //FIXME need to be parametrized
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1387277&r1=1387276&r2=1387277&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
Tue Sep 18 17:39:02 2012
@@ -46,7 +46,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -125,14 +124,7 @@ public class LangPanel extends AdminPane
target.add(form);
}
});
- item.add(AttributeModifier.replace("class", new
AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return (item.getIndex() % 2 == 1) ? "even" : "odd";
- }
- }));
+ item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java?rev=1387277&r1=1387276&r2=1387277&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
Tue Sep 18 17:39:02 2012
@@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
public class LdapsPanel extends AdminPanel {
@@ -57,14 +56,7 @@ public class LdapsPanel extends AdminPan
target.add(form);
}
});
- item.add(AttributeModifier.replace("class", new
AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return (item.getIndex() % 2 == 1) ? "even" : "odd";
- }
- }));
+ item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java?rev=1387277&r1=1387276&r2=1387277&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
Tue Sep 18 17:39:02 2012
@@ -32,7 +32,6 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
@@ -79,14 +78,7 @@ public class RoomsPanel extends AdminPan
target.add(form);
}
});
- item.add(AttributeModifier.replace("class", new
AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return (item.getIndex() % 2 == 1) ? "even" : "odd";
- }
- }));
+ item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
dataView.setItemsPerPage(8); //FIXME need to be parametrized
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java?rev=1387277&r1=1387276&r2=1387277&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
Tue Sep 18 17:39:02 2012
@@ -32,7 +32,6 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
@@ -79,14 +78,7 @@ public class ServersPanel extends AdminP
target.add(form);
}
});
- item.add(AttributeModifier.replace("class", new
AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return (item.getIndex() % 2 == 1) ? "even" : "odd";
- }
- }));
+ item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
dataView.setItemsPerPage(8); //FIXME need to be parametrized
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java?rev=1387277&r1=1387276&r2=1387277&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
Tue Sep 18 17:39:02 2012
@@ -23,7 +23,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.web.components.admin.AdminPanel;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.OmDataProvider;
-import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -51,14 +51,7 @@ public class UsersPanel extends AdminPan
item.add(new Label("firstName", fName));
final String lName = u.getLastname();
item.add(new Label("lastName", lName));
- item.add(new AjaxEventBehavior("onclick") {
- private static final long
serialVersionUID = -8069413566800571061L;
-
- protected void
onEvent(AjaxRequestTarget target) {
- form.setModelObject(u);
- target.add(form);
- }
- });
+ item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
}
};
final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
