From 8ec0890b788d756b751d1a9cce850d49b7d6ed70 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Thu, 12 Jul 2018 13:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E6=A3=80=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/manager/impl/ActionSearchManager.java | 8 +++++--- .../search/manager/impl/DocumentSearchManager.java | 8 +++++--- .../search/manager/impl/FileSearchManager.java | 12 +++++++----- .../search/manager/impl/PluginSearchManager.java | 8 +++++--- .../search/manager/impl/RecentSearchManager.java | 10 ++++++---- .../search/manager/impl/RecommendSearchManager.java | 8 +++++--- 6 files changed, 33 insertions(+), 21 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java index 75c9c6dd0..6bf8a9185 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java @@ -28,9 +28,11 @@ public class ActionSearchManager implements AlphaFineSearchProvider { private SearchResult moreModelList; public static ActionSearchManager getInstance() { - synchronized (ActionSearchManager.class) { - if (instance == null) { - instance = new ActionSearchManager(); + if (instance == null) { + synchronized (ActionSearchManager.class) { + if (instance == null) { + instance = new ActionSearchManager(); + } } } return instance; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java index b565b4003..a305d1341 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java @@ -25,9 +25,11 @@ public class DocumentSearchManager implements AlphaFineSearchProvider { private SearchResult moreModelList; public static DocumentSearchManager getInstance() { - synchronized (DocumentSearchManager.class) { - if (instance == null) { - instance = new DocumentSearchManager(); + if (instance == null) { + synchronized (DocumentSearchManager.class) { + if (instance == null) { + instance = new DocumentSearchManager(); + } } } return instance; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java index f1a909750..0427a1393 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java @@ -35,7 +35,7 @@ public class FileSearchManager implements AlphaFineSearchProvider { private static final String DS_NAME = "dsname=\""; private static final String FRM_PREFIX = "k:frm "; private static final String CPT_PREFIX = "k:cpt "; - private static FileSearchManager fileSearchManager; + private static FileSearchManager instance; private SearchResult filterModelList; private SearchResult lessModelList; private SearchResult moreModelList; @@ -48,12 +48,14 @@ public class FileSearchManager implements AlphaFineSearchProvider { private boolean isContainFrm = true; public static FileSearchManager getInstance() { - synchronized (FileSearchManager.class) { - if (fileSearchManager == null) { - fileSearchManager = new FileSearchManager(); + if (instance == null) { + synchronized (FileSearchManager.class) { + if (instance == null) { + instance = new FileSearchManager(); + } } } - return fileSearchManager; + return instance; } public synchronized static void init() { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java index c8f579507..c0d6f796a 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java @@ -32,9 +32,11 @@ public class PluginSearchManager implements AlphaFineSearchProvider { public static PluginSearchManager getInstance() { - synchronized (PluginSearchManager.class) { - if (instance == null) { - instance = new PluginSearchManager(); + if (instance == null) { + synchronized (PluginSearchManager.class) { + if (instance == null) { + instance = new PluginSearchManager(); + } } } return instance; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java index bec85098d..64d22b99d 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java @@ -60,10 +60,12 @@ public class RecentSearchManager implements AlphaFineSearchProvider { private SearchResult modelList; public static RecentSearchManager getInstance() { - synchronized (RecentSearchManager.class) { - if (instance == null) { - instance = new RecentSearchManager(); - instance.initWriter(); + if (instance == null) { + synchronized (RecentSearchManager.class) { + if (instance == null) { + instance = new RecentSearchManager(); + instance.initWriter(); + } } } return instance; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java index 2ecfb0903..4099cadbf 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java @@ -31,9 +31,11 @@ public class RecommendSearchManager implements AlphaFineSearchProvider { private SearchResult recommendModelList; public static RecommendSearchManager getInstance() { - synchronized (RecentSearchManager.class) { - if (instance == null) { - instance = new RecommendSearchManager(); + if (instance == null) { + synchronized (RecentSearchManager.class) { + if (instance == null) { + instance = new RecommendSearchManager(); + } } } return instance;