You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2009/05/06 23:02:43 UTC
svn commit: r772424 - in
/portals/jetspeed-2/applications/j2-admin/trunk/src/main:
java/org/apache/jetspeed/portlets/profiler/
resources/org/apache/jetspeed/portlets/profiler/
Author: vkumar
Date: Wed May 6 21:02:42 2009
New Revision: 772424
URL: http://svn.apache.org/viewvc?rev=772424&view=rev
Log:
Small fixes in Profiler Admin Portlet
1) Fixing validation problem in Criteria Tab
2) Removing duplicate feedabck panel Criteria Tab
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel$CriterionEditPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel.html
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java?rev=772424&r1=772423&r2=772424&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin.java Wed May 6 21:02:42 2009
@@ -277,6 +277,7 @@
Profiler profiler = getServiceLocator().getProfiler();
try {
criterion = profiler.createRuleCriterion();
+
criterionEditPanel.setVisible(true);
} catch (ClassNotFoundException e) {
logger.error("Could not create new rule criterion.", e);
@@ -288,7 +289,8 @@
setCriterion(null);
criterionEditPanel = new CriterionEditPanel("criterionEditPanel");
- ruleEditForm.add(criterionEditPanel);
+ criterionEditPanel.setOutputMarkupId(true);
+ add(criterionEditPanel);
criterionEditPanel.setVisible(false);
@@ -355,9 +357,6 @@
Form criterionEditForm = new Form("criterionEditForm");
- FeedbackPanel feedbackPanel = new FeedbackPanel("feedbackPanel");
- criterionEditForm.add(feedbackPanel);
-
criterionEditForm.add(new Label("criterionNameLabel", new ResourceModel("criterion.name")));
criterionEditForm.add(new Label("criterionValueLabel", new ResourceModel("criterion.value")));
criterionEditForm.add(new Label("criterionResolverTypeLabel", new ResourceModel("criterion.resolver")));
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel$CriterionEditPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin%24RuleEditPanel%24CriterionEditPanel.html?rev=772424&r1=772423&r2=772424&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel$CriterionEditPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel$CriterionEditPanel.html Wed May 6 21:02:42 2009
@@ -19,9 +19,7 @@
<div style="border:1px solid black; margin:4px; padding:4px;">
<form wicket:id="criterionEditForm">
-
- <span wicket:id="feedbackPanel">feedback message</span>
-
+
<table cellpadding="2">
<tr>
<td>
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin%24RuleEditPanel.html?rev=772424&r1=772423&r2=772424&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/profiler/WicketProfilerAdmin$RuleEditPanel.html Wed May 6 21:02:42 2009
@@ -54,11 +54,12 @@
<input type="submit" wicket:id="newCriterionButton"/>
- <div wicket:id="criterionEditPanel">criterionEditPanel</div>
+
<input type="submit" wicket:id="ruleSaveButton"/>
<input type="submit" wicket:id="ruleRemoveButton"/>
</form>
+ <div wicket:id="criterionEditPanel">criterionEditPanel</div>
</div>
</wicket:panel>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org