From 3582b24e63ecd91c08bd1f6ca2b8ace51642cd68 Mon Sep 17 00:00:00 2001 From: zwzhao Date: Mon, 10 Sep 2012 02:12:38 +0000 Subject: [PATCH] bug TDI-21143 fixed : Studio repository view : remove all refresh call to repo view git-svn-id: http://talendforge.org/svn/tos/trunk@90354 f6f1c999-d317-4740-80b0-e6d1abc6f99e --- .../model/repository/RepositoryManager.java | 113 +++++++++--------- .../ui/actions/AContextualAction.java | 28 ++--- .../metadata/CreateConnectionAction.java | 9 +- 3 files changed, 72 insertions(+), 78 deletions(-) diff --git a/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryManager.java b/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryManager.java index 5360eed738..5eb7fe07ef 100644 --- a/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryManager.java +++ b/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryManager.java @@ -94,38 +94,40 @@ public final class RepositoryManager { * for editorProperties */ public static void refreshEditorPropertiesNode(ERepositoryObjectType type) { - if (isRefreshManually() || !isRefreshCreated()) { - refresh(type); - } else { - IRepositoryView repositoryView = getRepositoryView(); - if (repositoryView != null) { - repositoryView.refresh(); - } - } - if (type != null) { - syncRoutineAndJoblet(type); - } + // TDI-21143 : Studio repository view : remove all refresh call to repo view + // if (isRefreshManually() || !isRefreshCreated()) { + // refresh(type); + // } else { + // IRepositoryView repositoryView = getRepositoryView(); + // if (repositoryView != null) { + // repositoryView.refresh(); + // } + // } + // if (type != null) { + // syncRoutineAndJoblet(type); + // } } public static void refreshCreatedNode(IProjectRepositoryNode projectNode, ERepositoryObjectType type) { - IRepositoryView repositoryView = getRepositoryView(); - if (repositoryView != null) { - if ((isRefreshManually() || !isRefreshCreated()) && !type.isSubItem()) { - if (projectNode != null) { - RepositoryNode rootNode = (RepositoryNode) projectNode.getRootRepositoryNode(type); - repositoryView.refreshAllChildNodes(rootNode); - } else { - // main project - refresh(type); - } - } else { - repositoryView.refresh(); - } - // qli modified to fix the bug 6659. - if (type != null) { - syncRoutineAndJoblet(type); - } - } + // TDI-21143 : Studio repository view : remove all refresh call to repo view + // IRepositoryView repositoryView = getRepositoryView(); + // if (repositoryView != null) { + // if ((isRefreshManually() || !isRefreshCreated()) && !type.isSubItem()) { + // if (projectNode != null) { + // RepositoryNode rootNode = (RepositoryNode) projectNode.getRootRepositoryNode(type); + // repositoryView.refreshAllChildNodes(rootNode); + // } else { + // // main project + // refresh(type); + // } + // } else { + // repositoryView.refresh(); + // } + // // qli modified to fix the bug 6659. + // if (type != null) { + // syncRoutineAndJoblet(type); + // } + // } } @@ -165,7 +167,7 @@ public final class RepositoryManager { // } // // } else { - repositoryView.refresh(); + // repositoryView.refresh(); // } } } @@ -175,17 +177,18 @@ public final class RepositoryManager { * for save */ public static void refreshSavedNode(RepositoryNode node) { - if (node == null) { - return; - } - IRepositoryView repositoryView = getRepositoryView(); - if (repositoryView != null) { - if (isRefreshManually() || !isRefreshSaved()) { - repositoryView.refresh(node); - } else { - repositoryView.refresh(); - } - } + // TDI-21143 : Studio repository view : remove all refresh call to repo view + // if (node == null) { + // return; + // } + // IRepositoryView repositoryView = getRepositoryView(); + // if (repositoryView != null) { + // if (isRefreshManually() || !isRefreshSaved()) { + // repositoryView.refresh(node); + // } else { + // repositoryView.refresh(); + // } + // } } /** @@ -193,22 +196,24 @@ public final class RepositoryManager { * */ public static void refresh(ERepositoryObjectType type) { - if (type != null) { - IRepositoryView repositoryView = getRepositoryView(); - if (repositoryView != null) { - repositoryView.refresh(type); - repositoryView.refresh(); - } - } + // TDI-21143 : Studio repository view : remove all refresh call to repo view + // if (type != null) { + // IRepositoryView repositoryView = getRepositoryView(); + // if (repositoryView != null) { + // repositoryView.refresh(type); + // repositoryView.refresh(); + // } + // } } public static void refresh(Set types) { - IRepositoryView repositoryView = getRepositoryView(); - if (types != null && repositoryView != null) { - for (ERepositoryObjectType type : types) { - repositoryView.refresh(type); - } - } + // TDI-21143 : Studio repository view : remove all refresh call to repo view + // IRepositoryView repositoryView = getRepositoryView(); + // if (types != null && repositoryView != null) { + // for (ERepositoryObjectType type : types) { + // repositoryView.refresh(type); + // } + // } } /** diff --git a/org.talend.core.runtime/src/main/java/org/talend/repository/ui/actions/AContextualAction.java b/org.talend.core.runtime/src/main/java/org/talend/repository/ui/actions/AContextualAction.java index e6082dee1c..8909915fdd 100644 --- a/org.talend.core.runtime/src/main/java/org/talend/repository/ui/actions/AContextualAction.java +++ b/org.talend.core.runtime/src/main/java/org/talend/repository/ui/actions/AContextualAction.java @@ -192,10 +192,11 @@ public abstract class AContextualAction extends Action implements ITreeContextua * Convenience method user to refresh view on wich action had been called. */ public void refresh() { - IRepositoryView viewPart = getViewPart(); - if (viewPart != null) { - viewPart.refresh(); - } + // TDI-21143 : Studio repository view : remove all refresh call to repo view + // IRepositoryView viewPart = getViewPart(); + // if (viewPart != null) { + // viewPart.refresh(); + // } } /** @@ -206,7 +207,8 @@ public abstract class AContextualAction extends Action implements ITreeContextua public void refresh(Object obj) { IRepositoryView viewPart = getViewPart(); if (viewPart != null) { - viewPart.refresh(obj); + // TDI-21143 : Studio repository view : remove all refresh call to repo view + // viewPart.refresh(obj); viewPart.expand(obj, true); } } @@ -454,7 +456,7 @@ public abstract class AContextualAction extends Action implements ITreeContextua if (repositoryNode.getContentType() == type) { foundNode = repositoryNode; } else { - foundNode = searchRepositoryNode((RepositoryNode) repositoryNode, type); + foundNode = searchRepositoryNode(repositoryNode, type); } if (foundNode != null) { return (RepositoryNode) foundNode; @@ -590,9 +592,6 @@ public abstract class AContextualAction extends Action implements ITreeContextua exist = true; doRun(); } - if (!exist) { - refreshRelatedItem(getOldItem()); - } } else { doRun(); } @@ -684,17 +683,6 @@ public abstract class AContextualAction extends Action implements ITreeContextua return this.oldItem; } - protected void refreshRelatedItem(Item item) { - if (item == null) { - return; - } - IRepositoryView viewPart = getViewPart(); - if (viewPart != null) { - ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item); - viewPart.refresh(itemType); - } - } - /** * Sets the node. * diff --git a/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/actions/metadata/CreateConnectionAction.java b/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/actions/metadata/CreateConnectionAction.java index 46832fd331..be77c90517 100644 --- a/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/actions/metadata/CreateConnectionAction.java +++ b/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/actions/metadata/CreateConnectionAction.java @@ -105,10 +105,11 @@ public class CreateConnectionAction extends AbstractCreateAction { repositoryNode = getRepositoryNodeForDefault(ERepositoryObjectType.METADATA_CONNECTIONS); } } - IRepositoryView view = getViewPart(); - if (view != null) { - view.refresh(); - } + // TDI-21143 : Studio repository view : remove all refresh call to repo view + // IRepositoryView view = getViewPart(); + // if (view != null) { + // view.refresh(); + // } RepositoryNode metadataNode = repositoryNode.getParent(); if (metadataNode != null) { // Force focus to the repositoryView and open Metadata and DbConnection nodes