From 8cc978da9bce8b8a696ab8c4e4bef829076649a6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 8 Mar 2012 17:26:48 +0000 Subject: [PATCH] Disable SLC log listener git-svn-id: https://svn.argeo.org/slc/trunk@5171 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../argeo/slc/client/ui/editors/ProcessEditor.java | 12 ++++++------ .../slc/client/ui/editors/ProcessLogPage.java | 14 +++++++------- .../org.argeo.slc.agent/META-INF/spring/agent.xml | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java index f4cd3f29e..2068aa697 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java +++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java @@ -40,11 +40,11 @@ public class ProcessEditor extends FormEditor implements private ProcessController processController; private ProcessBuilderPage builderPage; - private ProcessLogPage logPage; + //private ProcessLogPage logPage; private ExecutionModulesManager modulesManager; - private Boolean switchToLog = false; + //private Boolean switchToLog = false; @Override public void init(IEditorSite site, IEditorInput input) @@ -112,8 +112,8 @@ public class ProcessEditor extends FormEditor implements doSave(null); try { // show log - if (switchToLog) - setActivePage(logPage.getId()); +// if (switchToLog) +// setActivePage(logPage.getId()); ExecutionProcess process = processController.process(processNode); Map properties = new HashMap(); @@ -181,8 +181,8 @@ public class ProcessEditor extends FormEditor implements builderPage = new ProcessBuilderPage(this, processNode); addPage(builderPage); firePropertyChange(PROP_DIRTY); - logPage = new ProcessLogPage(this, processNode); - addPage(logPage); +// logPage = new ProcessLogPage(this, processNode); +// addPage(logPage); } catch (PartInitException e) { throw new SlcException("Cannot add pages", e); } diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessLogPage.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessLogPage.java index 46e50b6f0..4283bc5d1 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessLogPage.java +++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessLogPage.java @@ -46,7 +46,7 @@ public class ProcessLogPage extends FormPage { * optimization field: we compute once the length of the path to slc:log so * that we can easily substring the relative path of logs. */ - private Integer logPathLength; + //private Integer logPathLength; public ProcessLogPage(FormEditor editor, Node processNode) { super(editor, ID, "Log"); @@ -57,7 +57,7 @@ public class ProcessLogPage extends FormPage { try { String logBasePath = processNode.getPath() + '/' + SlcNames.SLC_LOG; - logPathLength = logBasePath.length(); + //logPathLength = logBasePath.length(); Workspace ws = processNode.getSession().getWorkspace(); @@ -125,12 +125,12 @@ public class ProcessLogPage extends FormPage { protected void appendLogEntry(StringBuffer buf, Node logEntry) throws RepositoryException { // +1 in order to remove the first slash - String relPath = logEntry.getPath().substring(logPathLength + 1); +// String relPath = logEntry.getPath().substring(logPathLength + 1); //System.out.println("relPath=" + relPath); - int firstSlashIndex = relPath.indexOf('/'); - int lastSlashIndex = relPath.lastIndexOf('/'); - String thread = relPath.substring(0, firstSlashIndex); - String location = relPath.substring(firstSlashIndex, lastSlashIndex); +// int firstSlashIndex = relPath.indexOf('/'); +// int lastSlashIndex = relPath.lastIndexOf('/'); +// String thread = relPath.substring(0, firstSlashIndex); +// String location = relPath.substring(firstSlashIndex, lastSlashIndex); // String date = dateFormat.format(logEntry // .getProperty(SlcNames.SLC_TIMESTAMP).getDate().getTime()); diff --git a/modules/agent/org.argeo.slc.agent/META-INF/spring/agent.xml b/modules/agent/org.argeo.slc.agent/META-INF/spring/agent.xml index 2cb735787..38cc1d4e1 100644 --- a/modules/agent/org.argeo.slc.agent/META-INF/spring/agent.xml +++ b/modules/agent/org.argeo.slc.agent/META-INF/spring/agent.xml @@ -14,13 +14,13 @@ - - - - - + + + + + + + \ No newline at end of file -- 2.39.2