Skip to content

Commit a9deacd

Browse files
committed
cleanup
1 parent ccc8e0e commit a9deacd

File tree

1 file changed

+6
-73
lines changed

1 file changed

+6
-73
lines changed

pm.eclipse.editbox/src/pm/eclipse/editbox/impl/BoxProviderRegistry.java

Lines changed: 6 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,7 @@ public void storeProviders(){
7676
protected Collection<IBoxProvider> defaultProviders() {
7777
List<IBoxProvider> result = new ArrayList<IBoxProvider>();
7878
// order important (see BoxProviderImpl.supports())
79-
/*
80-
result.add(cppProvider());
81-
result.add(javaProvider());
82-
result.add(jsProvider());
83-
result.add(markupProvider());
84-
result.add(pythonProvider());
85-
result.add(rubyProvider());
86-
result.add(textProvider());
87-
*/
88-
//DONE 1 refactor to use this more generic method
79+
// refactored to use this more generic method
8980
result.add(createProviderForNameAndExtentions("c++", Arrays.asList("*.c", "*.cpp", "*.h", "*.hpp") ) );
9081
result.add(createProviderForNameAndExtentions("java", Arrays.asList("*.java", "*.class", "*.groovy", "*.scala") ) );
9182
result.add(createProviderForNameAndExtentions("js", Arrays.asList("*.js", "*.jjs", "*.jshintrc", "*.mjs", "*.njs", "*.pjs", "*.vjs", "*.ts", "*.coffee", "*.dart") ) );
@@ -94,7 +85,10 @@ protected Collection<IBoxProvider> defaultProviders() {
9485
result.add(createProviderForNameAndExtentions("php", Arrays.asList("*.php") ) );
9586
result.add(createProviderForNameAndExtentions("python", Arrays.asList("*.py") ) );
9687
result.add(createProviderForNameAndExtentions("ruby", Arrays.asList("*.rb", "*.ruby") ) );
97-
result.add(createProviderForNameAndExtentions("text", Arrays.asList("*.txt", "*.*") ) ); // "*.*" makes default to every file
88+
result.add(createProviderForNameAndExtentions("text", Arrays.asList("*.txt", "*.") ) );
89+
result.add(createProviderForNameAndExtentions("xml", Arrays.asList("*.xml", "*.launch", "*.project", "*.classpath") ) );
90+
result.add(createProviderForNameAndExtentions("exclude", Arrays.asList("*.ascii") ) );
91+
result.add(createProviderForNameAndExtentions("others", Arrays.asList("*.*") ) ); // "*.*" makes default to every file
9892
return result;
9993
}
10094

@@ -110,75 +104,14 @@ protected BoxProviderImpl createProvider(String name) {
110104
return provider;
111105
}
112106

113-
//DONE 1 refactor to use this more generic method
107+
// refactored to use this more generic method
114108
protected BoxProviderImpl createProviderForNameAndExtentions(String name, List<String> extentions) {
115109
BoxProviderImpl provider = createProvider(name);
116110
provider.setDefaultSettingsCatalog(ALL_THEMES_LIST);
117111
if (provider.getEditorsBoxSettings().getFileNames() == null)
118112
provider.getEditorsBoxSettings().setFileNames(extentions);
119113
return provider;
120114
}
121-
/*
122-
protected BoxProviderImpl cppProvider() {
123-
BoxProviderImpl provider = createProvider("c++");
124-
provider.setDefaultSettingsCatalog(ALL_THEMES_LIST);
125-
if (provider.getEditorsBoxSettings().getFileNames() == null)
126-
provider.getEditorsBoxSettings().setFileNames(Arrays.asList("*.c", "*.cpp", "*.h", "*.hpp"));
127-
return provider;
128-
}
129-
130-
protected BoxProviderImpl javaProvider() {
131-
BoxProviderImpl provider = createProvider("java");
132-
provider.setDefaultSettingsCatalog(ALL_THEMES_LIST);
133-
if (provider.getEditorsBoxSettings().getFileNames() == null)
134-
provider.getEditorsBoxSettings().setFileNames(Arrays.asList("*.java", "*.class", "*.groovy", "*.scala"));
135-
return provider;
136-
}
137-
138-
protected BoxProviderImpl jsProvider() {
139-
BoxProviderImpl provider = createProvider("js");
140-
provider.setDefaultSettingsCatalog(ALL_THEMES_LIST);
141-
if (provider.getEditorsBoxSettings().getFileNames() == null)
142-
// as in Nodeclipse JSHint settings file com.eclipsesource.jshint.ui.prefs
143-
// included=//*.jjs\://*.js\://*.jshintrc\://*.mjs\://*.njs\://*.pjs\://*.vjs
144-
provider.getEditorsBoxSettings().setFileNames(Arrays.asList(
145-
"*.js", "*.jjs", "*.jshintrc", "*.mjs", "*.njs", "*.pjs", "*.vjs", "*.ts", "*.coffee"));
146-
return provider;
147-
}
148-
149-
protected BoxProviderImpl markupProvider() {
150-
BoxProviderImpl provider = createProvider("markup");
151-
provider.setDefaultSettingsCatalog(ALL_THEMES_LIST);
152-
if (provider.getEditorsBoxSettings().getFileNames() == null)
153-
provider.getEditorsBoxSettings().setFileNames(Arrays.asList("*.*ml", "*.jsp", "*.md"));
154-
return provider;
155-
}
156-
157-
protected BoxProviderImpl pythonProvider() {
158-
BoxProviderImpl provider = createProvider("python");
159-
provider.setDefaultSettingsCatalog(ALL_THEMES_LIST);
160-
if (provider.getEditorsBoxSettings().getFileNames() == null)
161-
provider.getEditorsBoxSettings().setFileNames(Arrays.asList("*.py"));
162-
return provider;
163-
}
164-
165-
protected BoxProviderImpl rubyProvider() {
166-
BoxProviderImpl provider = createProvider("ruby");
167-
provider.setDefaultSettingsCatalog(ALL_THEMES_LIST);
168-
if (provider.getEditorsBoxSettings().getFileNames() == null)
169-
provider.getEditorsBoxSettings().setFileNames(Arrays.asList("*.rb", "*.ruby"));
170-
return provider;
171-
}
172-
173-
protected BoxProviderImpl textProvider() {
174-
BoxProviderImpl provider = createProvider("text");
175-
provider.setDefaultSettingsCatalog(ALL_THEMES_LIST);
176-
if (provider.getEditorsBoxSettings().getFileNames() == null)
177-
provider.getEditorsBoxSettings().setFileNames(Arrays.asList("*.txt", "*.*"));
178-
return provider;
179-
}
180-
*/
181-
//}
182115

183116
protected Map<String, Class> defaultBuilders() {
184117
Map<String, Class> result = new HashMap<String, Class>();

0 commit comments

Comments
 (0)