Skip to content

Commit 684888f

Browse files
committed
setIgnored() -> initializeIgnoredNames in RepositoryFactory
fixes #1615
1 parent 8a39fd3 commit 684888f

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

src/org/opensolaris/opengrok/history/RepositoryFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public static Repository getRepository(RepositoryInfo info) throws Instantiation
177177
* inside repository classes rather than globally in IgnoredFiles/Dirs.
178178
* Should be called after {@code setConfiguration()}.
179179
*/
180-
public static void setIgnored(RuntimeEnvironment env) {
180+
public static void initializeIgnoredNames(RuntimeEnvironment env) {
181181
for (Repository repo : repositories) {
182182
for (String file : repo.getIgnoredFiles()) {
183183
env.getIgnoredNames().add("f:" + file);

src/org/opensolaris/opengrok/index/Indexer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ public static void main(String argv[]) {
541541
// Let repository types to add items to ignoredNames.
542542
// This changes env so is called after the setConfiguration()
543543
// call above.
544-
RepositoryFactory.setIgnored(env);
544+
RepositoryFactory.initializeIgnoredNames(env);
545545

546546
if (noindex) {
547547
getInstance().sendToConfigHost(env, host, port);

test/org/opensolaris/opengrok/configuration/messages/ProjectMessageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void setUp() throws IOException {
8484
env.setSourceRoot(repository.getSourceRoot());
8585
env.setDataRoot(repository.getDataRoot());
8686
env.setProjectsEnabled(true);
87-
RepositoryFactory.setIgnored(env);
87+
RepositoryFactory.initializeIgnoredNames(env);
8888
}
8989

9090
@After

test/org/opensolaris/opengrok/history/HistoryGuruTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static void setUpClass() throws Exception {
5959
repository = new TestRepository();
6060
repository.create(HistoryGuru.class.getResourceAsStream(
6161
"repositories.zip"));
62-
RepositoryFactory.setIgnored(RuntimeEnvironment.getInstance());
62+
RepositoryFactory.initializeIgnoredNames(RuntimeEnvironment.getInstance());
6363
FileUtilities.getAllFiles(new File(repository.getSourceRoot()),
6464
files, true);
6565
RuntimeEnvironment.getInstance().setVerbose(true);

test/org/opensolaris/opengrok/history/PerforceRepositoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void setUpClass() throws Exception {
6464
return;
6565
}
6666
files = new ArrayList<>();
67-
RepositoryFactory.setIgnored(RuntimeEnvironment.getInstance());
67+
RepositoryFactory.initializeIgnoredNames(RuntimeEnvironment.getInstance());
6868
FileUtilities.getAllFiles(root, files, false);
6969
}
7070

test/org/opensolaris/opengrok/index/IgnoredNamesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static void setUpClass() throws Exception {
6565
"/org/opensolaris/opengrok/index/source.zip"));
6666

6767
// Populate ignored lists with repository specific entries.
68-
RepositoryFactory.setIgnored(RuntimeEnvironment.getInstance());
68+
RepositoryFactory.initializeIgnoredNames(RuntimeEnvironment.getInstance());
6969
}
7070

7171
/**

test/org/opensolaris/opengrok/index/IndexDatabaseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static void setUpClass() throws Exception {
6767
env.setDataRoot(repository.getDataRoot());
6868
env.setHistoryEnabled(true);
6969
env.setProjectsEnabled(true);
70-
RepositoryFactory.setIgnored(env);
70+
RepositoryFactory.initializeIgnoredNames(env);
7171

7272
// Note that all tests in this class share the index created below.
7373
// Ergo, if they need to modify it, this has to be done in such a way

test/org/opensolaris/opengrok/index/IndexerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public IndexerTest() {
7373
public static void setUpClass() throws Exception {
7474
assertTrue("No point in running indexer tests without valid ctags",
7575
RuntimeEnvironment.getInstance().validateExuberantCtags());
76-
RepositoryFactory.setIgnored(RuntimeEnvironment.getInstance());
76+
RepositoryFactory.initializeIgnoredNames(RuntimeEnvironment.getInstance());
7777
}
7878

7979
@AfterClass

test/org/opensolaris/opengrok/search/SearchEngineTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void setUpClass() throws Exception {
6161
env.setCtags(System.getProperty("org.opensolaris.opengrok.analysis.Ctags", "ctags"));
6262
env.setSourceRoot(repository.getSourceRoot());
6363
env.setDataRoot(repository.getDataRoot());
64-
RepositoryFactory.setIgnored(env);
64+
RepositoryFactory.initializeIgnoredNames(env);
6565

6666
if (env.validateExuberantCtags()) {
6767
env.setSourceRoot(repository.getSourceRoot());

test/org/opensolaris/opengrok/web/DirectoryListingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public void setUp() throws Exception {
212212

213213
// Need to populate list of ignored entries for all repository types.
214214
RuntimeEnvironment env = RuntimeEnvironment.getInstance();
215-
RepositoryFactory.setIgnored(env);
215+
RepositoryFactory.initializeIgnoredNames(env);
216216
}
217217

218218
@After

0 commit comments

Comments
 (0)