Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BCD99200BEF for ; Wed, 4 Jan 2017 17:41:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BB783160B21; Wed, 4 Jan 2017 16:41:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E005A160B3A for ; Wed, 4 Jan 2017 17:41:45 +0100 (CET) Received: (qmail 83275 invoked by uid 500); 4 Jan 2017 16:41:40 -0000 Mailing-List: contact commits-help@chemistry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@chemistry.apache.org Delivered-To: mailing list commits@chemistry.apache.org Received: (qmail 83145 invoked by uid 99); 4 Jan 2017 16:41:40 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2017 16:41:40 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id A30503A1E65 for ; Wed, 4 Jan 2017 16:41:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1777339 - in /chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench: swing/ActionPanel.java worker/LoadFolderWorker.java worker/LoadObjectWorker.java Date: Wed, 04 Jan 2017 16:41:39 -0000 To: commits@chemistry.apache.org From: fmui@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170104164139.A30503A1E65@svn01-us-west.apache.org> archived-at: Wed, 04 Jan 2017 16:41:46 -0000 Author: fmui Date: Wed Jan 4 16:41:39 2017 New Revision: 1777339 URL: http://svn.apache.org/viewvc?rev=1777339&view=rev Log: Worbench: fixed object reload Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadFolderWorker.java chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadObjectWorker.java Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java?rev=1777339&r1=1777338&r2=1777339&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/ActionPanel.java Wed Jan 4 16:41:39 2017 @@ -39,6 +39,7 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.workbench.ClientHelper; import org.apache.chemistry.opencmis.workbench.WorkbenchScale; import org.apache.chemistry.opencmis.workbench.model.ClientModel; +import org.apache.chemistry.opencmis.workbench.worker.LoadFolderWorker; import org.apache.chemistry.opencmis.workbench.worker.LoadObjectWorker; public abstract class ActionPanel extends JPanel implements ActionListener { @@ -126,7 +127,7 @@ public abstract class ActionPanel extend protected void reload(final boolean reloadObject) { if (model.getCurrentFolder() != null) { - LoadObjectWorker worker = new LoadObjectWorker(ActionPanel.this, model, model.getCurrentFolder().getId()) { + LoadFolderWorker worker = new LoadFolderWorker(ActionPanel.this, model, model.getCurrentFolder().getId()) { @Override protected void done() { super.done(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadFolderWorker.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadFolderWorker.java?rev=1777339&r1=1777338&r2=1777339&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadFolderWorker.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadFolderWorker.java Wed Jan 4 16:41:39 2017 @@ -28,7 +28,7 @@ import org.apache.chemistry.opencmis.wor public class LoadFolderWorker extends InfoWorkbenchWorker { - private ClientModel model; + final private ClientModel model; private String id; private boolean byPath; @@ -66,6 +66,22 @@ public class LoadFolderWorker extends In } } + public LoadFolderWorker(Component comp, ClientModel model, String id) { + super(comp); + + this.model = model; + this.id = id; + this.byPath = false; + + if (this.id != null) { + if (this.id.length() == 0) { + this.id = "/"; + } + + byPath = id.charAt(0) == '/'; + } + } + public LoadFolderWorker(Window parent, ClientModel model, String id) { super(parent); Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadObjectWorker.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadObjectWorker.java?rev=1777339&r1=1777338&r2=1777339&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadObjectWorker.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/worker/LoadObjectWorker.java Wed Jan 4 16:41:39 2017 @@ -34,13 +34,13 @@ public class LoadObjectWorker extends In public static void reloadObject(Component comp, ClientModel model) { if (model.getCurrentObject() != null) { - (new LoadObjectWorker(comp, model, model.getCurrentObject().getId())).executeTask(); + (new LoadObjectWorker(comp, model, null)).executeTask(); } } public static void reloadObject(Window parent, ClientModel model) { if (model.getCurrentObject() != null) { - (new LoadObjectWorker(parent, model, model.getCurrentObject().getId())).executeTask(); + (new LoadObjectWorker(parent, model, null)).executeTask(); } } @@ -69,13 +69,6 @@ public class LoadObjectWorker extends In } @Override - public void executeTask() { - if (id != null) { - super.executeTask(); - } - } - - @Override protected Object doInBackground() throws Exception { if (id == null) { model.reloadObject();