Project

General

Profile

« Previous | Next » 

Revision 821fe02d

Added by Katja Luther over 3 years ago

create new branch webapp

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
90 90
import eu.etaxonomy.cdm.model.validation.EntityValidation;
91 91
import eu.etaxonomy.cdm.persistence.permission.ICdmPermissionEvaluator;
92 92
import eu.etaxonomy.cdm.persistence.permission.Role;
93
import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
94
import eu.etaxonomy.taxeditor.datasource.ICdmServer;
95 93
import eu.etaxonomy.taxeditor.io.ExportManager;
96 94
import eu.etaxonomy.taxeditor.io.ImportManager;
97 95
import eu.etaxonomy.taxeditor.model.MessagingUtils;
......
115 113
 */
116 114
public class CdmStore {
117 115

  
118
    private static final Resource DEFAULT_APPLICATION_CONTEXT = new ClassPathResource(
116
    public static final Resource DEFAULT_APPLICATION_CONTEXT = new ClassPathResource(
119 117
            "/eu/etaxonomy/cdm/editorApplicationContext.xml",
120 118
            TaxeditorStorePlugin.class);
121 119

  
122
    private static final DbSchemaValidation DEFAULT_DB_SCHEMA_VALIDATION = DbSchemaValidation.VALIDATE;
120
    public static final DbSchemaValidation DEFAULT_DB_SCHEMA_VALIDATION = DbSchemaValidation.VALIDATE;
123 121

  
124
    private static CdmStore instance;
122
    protected static CdmStore instance;
125 123

  
126 124
    private static ContextManager contextManager = new ContextManager();
127 125

  
......
137 135

  
138 136
    private static CdmStoreConnector job;
139 137

  
140
    private static ICdmServer managedServer;
138
//    private static CdmServer managedServer;
141 139

  
142 140
    private Language language;
143 141

  
......
146 144
    private boolean isConnected;
147 145

  
148 146
    protected static CdmStore getDefault(boolean connecting){
149
        if (instance != null && instance.isConnected) {
147
        if (instance != null && instance.isConnected()) {
150 148
            return instance;
151 149
        } else{// if (instance == null || !instance.isConnected) {
152 150
            if (connecting){
......
167 165
     * @deprecated this method is not needed anymore after fully changing to remoting.
168 166
     * Therefore it will be removed
169 167
     */
170
    @Deprecated
171
    public static void connect() {
172
        try {
173
            ICdmSource cdmSource = CdmDataSourceRepository.getCurrentCdmSource();
174
            connect(cdmSource);
175
        } catch (Exception e) {
176
            MessagingUtils.messageDialog("Connection to CDM Source Failed", CdmStore.class, "Could not connect to target CDM Source", e);
177
        }
178
    }
168
//    @Deprecated
169
//    public static void connect() {
170
//        try {
171
//            ICdmSource cdmSource = CdmDataSourceRepository.getCurrentCdmSource();
172
//            connect(cdmSource);
173
//        } catch (Exception e) {
174
//            MessagingUtils.messageDialog("Connection to CDM Source Failed", CdmStore.class, "Could not connect to target CDM Source", e);
175
//        }
176
//    }
179 177

  
180 178
    /**
181 179
     * Initialize with a specific datasource
......
274 272
    }
275 273

  
276 274
    private void close() {
277
        this.isConnected = false;
275
        this.setConnected(false);
278 276
        this.cdmSource = null;
279 277
        CdmApplicationState.dispose();
280 278
    }
281 279

  
282
    static void setInstance(ICdmRepository applicationController,
280
    public static void setInstance(ICdmRepository applicationController,
283 281
            ICdmSource cdmSource) {
284 282
        instance = new CdmStore(applicationController, cdmSource);
285 283
        CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());
286 284
    }
287 285

  
288
    private CdmStore(ICdmRepository repository,
286
    protected CdmStore(ICdmRepository repository,
289 287
            ICdmSource cdmSource) {
290 288
        CdmApplicationState.setCurrentAppConfig(repository);
291 289
        CdmApplicationState.setCurrentDataChangeService(new CdmUIDataChangeService());
292 290
        this.cdmSource = cdmSource;
293
        isConnected = true;
291
        setConnected(true);
294 292
    }
295 293

  
296 294
    /**
......
525 523
     * @return a boolean.
526 524
     */
527 525
    public static boolean isActive() {
528
        return instance != null && instance.isConnected;
526
        return instance != null && instance.isConnected();
529 527
    }
530 528

  
531 529
    public static ICdmSource getActiveCdmSource() {
......
634 632
        return service;
635 633
    }
636 634

  
637
    public static void setManagedServer(ICdmServer server) {
638
        managedServer = server;
635
//
636
//    public static void setManagedServer(ICdmServer server) {
637
//        managedServer = server;
638
//    }
639
//
640
//    public static ICdmServer getManagedServer() {
641
//        return managedServer;
642

  
643
    public boolean isConnected() {
644
        return isConnected;
639 645
    }
640 646

  
641
    public static ICdmServer getManagedServer() {
642
        return managedServer;
647
    public void setConnected(boolean isConnected) {
648
        this.isConnected = isConnected;
649

  
643 650
    }
644 651

  
652

  
645 653
}

Also available in: Unified diff