[jboss-svn-commits] JBL Code SVN: r30322 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: client/messages and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 24 07:14:16 EST 2009
Author: jervisliu
Date: 2009-11-24 07:14:15 -0500 (Tue, 24 Nov 2009)
New Revision: 30322
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/LogViewer.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java
Log:
GUVNOR-63: Log viewer needs a "clear" button
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/LogViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/LogViewer.java 2009-11-24 11:05:14 UTC (rev 30321)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/LogViewer.java 2009-11-24 12:14:15 UTC (rev 30322)
@@ -38,7 +38,7 @@
public class LogViewer extends Composite {
private VerticalPanel layout;
- private Constants constants;
+ private Constants constants = ((Constants) GWT.create(Constants.class));;
public LogViewer() {
layout = new VerticalPanel();
@@ -50,7 +50,6 @@
}
private void refresh() {
- constants = ((Constants) GWT.create(Constants.class));
LoadingPopup.showMessage(constants.LoadingLogMessages());
RepositoryServiceFactory.getService().showLog(new GenericCallback<LogEntry[]>() {
public void onSuccess(LogEntry[] logs) {
@@ -60,6 +59,16 @@
});
}
+ private void cleanLog() {
+ LoadingPopup.showMessage(constants.CleaningLogMessages());
+ RepositoryServiceFactory.getService().cleanLog(new GenericCallback() {
+ public void onSuccess(Object data) {
+ refresh();
+ LoadingPopup.close();
+ }
+ });
+ }
+
private void showLogs(LogEntry[] logs) {
List<LogEntry> entries = new ArrayList<LogEntry>();
@@ -164,7 +173,16 @@
});
tb.addButton(reload);
+
+ ToolbarButton clean = new ToolbarButton(constants.Clean());
+ clean.addListener(new ButtonListenerAdapter() {
+ public void onClick(Button button, EventObject e) {
+ layout.remove(g);
+ cleanLog();
+ }
+ });
+ tb.addButton(clean);
}
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2009-11-24 11:05:14 UTC (rev 30321)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2009-11-24 12:14:15 UTC (rev 30322)
@@ -1999,4 +1999,7 @@
String Severity();
+ String CleaningLogMessages();
+
+ String Clean();
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2009-11-24 11:05:14 UTC (rev 30321)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2009-11-24 12:14:15 UTC (rev 30322)
@@ -952,3 +952,5 @@
TypeRestored=Restored
TypeUpdated=Updated
Severity=Severity
+CleaningLogMessages=Cleaning log messages...
+Clean=Clean
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2009-11-24 11:05:14 UTC (rev 30321)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2009-11-24 12:14:15 UTC (rev 30322)
@@ -422,6 +422,10 @@
*/
public LogEntry[] showLog();
+ /**
+ * clean up the log entry.
+ */
+ public void cleanLog();
/**
* @param valuePairs key=value pairs to be interpolated into the expression.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2009-11-24 11:05:14 UTC (rev 30321)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2009-11-24 12:14:15 UTC (rev 30322)
@@ -90,6 +90,7 @@
public void runScenariosInPackage(java.lang.String p0, AsyncCallback<org.drools.guvnor.client.rpc.BulkTestRunResult> cb);
public void analysePackage(java.lang.String p0, AsyncCallback<org.drools.guvnor.client.rpc.AnalysisReport> cb);
public void listTypesInPackage(java.lang.String p0, AsyncCallback<java.lang.String[]> cb);
+ public void cleanLog(AsyncCallback cb);
public void showLog(AsyncCallback<org.drools.guvnor.client.rpc.LogEntry[]> cb);
public void loadDropDownExpression(java.lang.String[] p0, java.lang.String p1, AsyncCallback<java.lang.String[]> cb);
public void queryFullText(java.lang.String p0, boolean p1, int p2, int p3, AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> cb);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2009-11-24 11:05:14 UTC (rev 30321)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2009-11-24 12:14:15 UTC (rev 30322)
@@ -267,6 +267,9 @@
public org.drools.guvnor.client.rpc.LogEntry[] showLog() {
return getService().showLog();
}
+ public void cleanLog() {
+ getService().cleanLog();
+ }
public java.lang.String[] loadDropDownExpression(java.lang.String[] p0, java.lang.String p1) {
return getService().loadDropDownExpression( p0, p1);
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2009-11-24 11:05:14 UTC (rev 30321)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2009-11-24 12:14:15 UTC (rev 30322)
@@ -2262,10 +2262,19 @@
}
return LoggingHelper.getMessages();
-
}
@WebRemote
+ public void cleanLog() {
+ if ( Contexts.isSessionContextActive() ) {
+ Identity.instance().checkPermission( new AdminType(),
+ RoleTypes.ADMIN );
+ }
+
+ LoggingHelper.cleanLog();
+ }
+
+ @WebRemote
@Restrict("#{identity.loggedIn}")
public void renameCategory(String fullPathAndName,
String newName) {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java 2009-11-24 11:05:14 UTC (rev 30321)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java 2009-11-24 12:14:15 UTC (rev 30322)
@@ -25,7 +25,10 @@
return messages.getMessages();
}
-
+ public static void cleanLog() {
+ messages.cleanEntry();
+ }
+
public static Logger getLogger(Class cls) {
Logger l = Logger.getLogger( cls );
@@ -92,8 +95,9 @@
class MessageList {
static int MAX = 500;
- final LogEntry[] messages = new LogEntry[MAX];
+ LogEntry[] messages = new LogEntry[MAX];
int current = 0;
+
public MessageList() {
}
@@ -103,14 +107,15 @@
current = 0;
}
messages[current++] = e;
-
}
public LogEntry[] getMessages() {
return messages;
}
+
+ public synchronized void cleanEntry() {
+ messages = new LogEntry[MAX];
+ }
-
-
}
More information about the jboss-svn-commits
mailing list