Project

General

Profile

« Previous | Next » 

Revision 0d2ee5d6

Added by Andreas Müller over 6 years ago

fix #4461 fix ordering for Datasource View

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java
59 59 
				break;
60 60 
			case 8:
61 61 
				// is compatible
62 
				break;
62 
				boolean c1 = d1.isDataSourceCompatible();
63 
				boolean c2 = d2.isDataSourceCompatible();
64 
				if (c1 == c2){
65 
					result = 0;
66 
				}else if (c1 == true){
67 
					result = -1;
68 
				}else{
69 
					result = 1;
70 
				}
71 
				break;
63 72 
			case 7:
64 73 
				result = d1.getMetaData(MetaDataPropertyName.DB_SCHEMA_VERSION).compareTo(d2.getMetaData(MetaDataPropertyName.DB_SCHEMA_VERSION));
65 74 
				break;
......
67 76 
				result = d1.getMetaData(MetaDataPropertyName.DB_CREATE_DATE).compareTo(d2.getMetaData(MetaDataPropertyName.DB_CREATE_DATE));
68 77 
				break;
69 78 
			case 5:
70 
				// is running
71 
				break;
72 
			case 4:
73 79 
				if(cs1 instanceof ICdmDataSource && cs2 instanceof ICdmDataSource) {
74 80 
					result = ((ICdmDataSource)cs1).getDatabase().compareTo(((ICdmDataSource)cs2).getDatabase());
75 81 
				}
76 82
77 83 
				break;
78 
			case 3:
84 
			case 4:
79 85 
				if(cs1 instanceof ICdmDataSource && cs2 instanceof ICdmDataSource) {
80 86 
					result = ((ICdmDataSource)cs1).getDatabaseType().getName().compareTo(((ICdmDataSource)cs2).getDatabaseType().getName());
81 87 
				}
82 88 
				break;
89 
			case 3:
90 
				// is running
91 
				boolean r1 = d1.isRunning();
92 
				boolean r2 = d2.isRunning();
93 
				if (r1 == r2){
94 
					result = 0;
95 
				}else if (r1 == true){
96 
					result = -1;
97 
				}else{
98 
					result = 1;
99 
				}
100 
				break;
83 101 
			case 2:
84 102 
				String server1 = d1.getCdmSource().getServer();
85 103 
				String server2 = d2.getCdmSource().getServer();
86 
				if(server1 != null && server2 != null){
87 
					result = server1.compareTo(server2);
88 
				}
89 104 
				// h2 databases do not have server entries
105 
				server1 = server1 == null? "local" : server1;
106 
				server2 = server2 == null? "local" : server2;
107 
				result = server1.compareTo(server2);
90 108 
				break;
91 109 
			default:
92 110 
				result = d1.getCdmSource().getName().compareTo(d2.getCdmSource().getName());

Also available in: Unified diff