Skip to content

Commit a082110

Browse files
pmbittnerpmbittner
committed
namespace made consistent
1 parent b68d095 commit a082110

14 files changed

Lines changed: 27 additions & 28 deletions

File tree

‎docker-resources/extraction_busybox.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ analysis.number_of_tasks = 5
4444
#######################################
4545

4646
# Do not change this
47-
analysis.class = de.variantsync.vevos.extraction.kh.VariabilityAnalysis
47+
analysis.class = org.variantsync.vevos.extraction.kh.VariabilityAnalysis
4848
preparation.class.0 = net.ssehub.kernel_haven.busyboot.PrepareBusybox
4949
analysis.output.type = csv
5050

‎docker-resources/extraction_linux.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ analysis.number_of_tasks = 3
4444
#######################################
4545

4646
# Do not change this
47-
analysis.class = de.variantsync.vevos.extraction.kh.VariabilityAnalysis
47+
analysis.class = org.variantsync.vevos.extraction.kh.VariabilityAnalysis
4848
analysis.output.type = csv
4949
analysis.code_block.consider_missing_bm_infos = false
5050

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<!-- Adjust group id for anonymous projects -->
8-
<groupId>vevos.extraction</groupId>
8+
<groupId>org.variantsync.vevos</groupId>
99
<!-- Adjust the project name -->
10-
<artifactId>Extraction</artifactId>
10+
<artifactId>extraction</artifactId>
1111
<version>1.0.0</version>
1212

1313
<properties>

src/main/java/de/variantsync/vevos/extraction/AnalysisTask.java renamed to src/main/java/org/variantsync/vevos/extraction/AnalysisTask.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package de.variantsync.vevos.extraction;
1+
package org.variantsync.vevos.extraction;
22

3-
import de.variantsync.vevos.extraction.util.ConfigManipulator;
4-
import de.variantsync.vevos.extraction.util.ShellExecutor;
3+
import org.variantsync.vevos.extraction.util.ConfigManipulator;
4+
import org.variantsync.vevos.extraction.util.ShellExecutor;
55
import net.lingala.zip4j.ZipFile;
66
import net.lingala.zip4j.exception.ZipException;
77
import net.ssehub.kernel_haven.SetUpException;
@@ -23,7 +23,6 @@
2323
import java.util.stream.Collectors;
2424
import java.util.stream.Stream;
2525

26-
import static de.variantsync.vevos.extraction.Extraction.*;
2726
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
2827

2928
public class AnalysisTask implements Runnable {
@@ -69,9 +68,9 @@ public void run() {
6968
try {
7069
Configuration config;
7170
config = new Configuration(propertiesFile);
72-
config.registerSetting(LOG_LEVEL_MAIN);
73-
config.registerSetting(EXTRACTION_TIMEOUT);
74-
LOGGER.setLevel(config.getValue(LOG_LEVEL_MAIN));
71+
config.registerSetting(Extraction.LOG_LEVEL_MAIN);
72+
config.registerSetting(Extraction.EXTRACTION_TIMEOUT);
73+
LOGGER.setLevel(config.getValue(Extraction.LOG_LEVEL_MAIN));
7574
prepareConfig(workDir, propertiesFile);
7675
} catch (SetUpException e) {
7776
LOGGER.logError("Invalid configuration detected:", e.getMessage());
@@ -335,7 +334,7 @@ private void createBlocker(File dir) {
335334
try {
336335
if (!blocker.createNewFile()) {
337336
LOGGER.logError("Was not able to create blocker file!");
338-
quitOnError();
337+
Extraction.quitOnError();
339338
} else {
340339
LOGGER.logInfo("BLOCKED - OK");
341340
}
@@ -354,7 +353,7 @@ private void adjustMakefiles(File dir) {
354353
makefiles.forEach(this::removeErrorFlags);
355354
} catch (IOException e) {
356355
LOGGER.logException("Was not able to search for Makefiles: ", e);
357-
quitOnError();
356+
Extraction.quitOnError();
358357
}
359358
}
360359

@@ -366,11 +365,11 @@ private void removeErrorFlags(Path pathToFile) {
366365
lines = reader.lines().collect(Collectors.toList());
367366
} catch (IOException e) {
368367
LOGGER.logException("Was not able to read Makefile: " + pathToFile, e);
369-
quitOnError();
368+
Extraction.quitOnError();
370369
}
371370
if (lines == null) {
372371
LOGGER.logError("The file's content is null: " + pathToFile);
373-
quitOnError();
372+
Extraction.quitOnError();
374373
}
375374

376375
// Remove all error flags
@@ -391,7 +390,7 @@ private void removeErrorFlags(Path pathToFile) {
391390
}
392391
} catch (IOException e) {
393392
LOGGER.logException("Was not able to write adjusted Makefile " + pathToFile, e);
394-
quitOnError();
393+
Extraction.quitOnError();
395394
}
396395
}
397396

@@ -401,7 +400,7 @@ private void checkBlocker(File dir) {
401400
if (blocker.exists()) {
402401
LOGGER.logError("The SPL directory is blocked by another task! This indicates a bug in the " +
403402
"implementation of multi-threading.");
404-
quitOnError();
403+
Extraction.quitOnError();
405404
} else {
406405
LOGGER.logInfo("NO BLOCK FOUND - OK");
407406
}
@@ -412,7 +411,7 @@ private void deleteBlocker(File dir) {
412411
File blocker = new File(dir, "BLOCKER.txt");
413412
if (!blocker.delete()) {
414413
LOGGER.logError("Was not able to delete blocker file!");
415-
quitOnError();
414+
Extraction.quitOnError();
416415
} else {
417416
LOGGER.logInfo("BLOCK REMOVED - OK");
418417
}

src/main/java/de/variantsync/vevos/extraction/Extraction.java renamed to src/main/java/org/variantsync/vevos/extraction/Extraction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package de.variantsync.vevos.extraction;
1+
package org.variantsync.vevos.extraction;
22

3-
import de.variantsync.vevos.extraction.util.ShellExecutor;
4-
import de.variantsync.vevos.extraction.util.GitUtil;
3+
import org.variantsync.vevos.extraction.util.ShellExecutor;
4+
import org.variantsync.vevos.extraction.util.GitUtil;
55
import net.ssehub.kernel_haven.SetUpException;
66
import net.ssehub.kernel_haven.config.Configuration;
77
import net.ssehub.kernel_haven.config.EnumSetting;

src/main/java/de/variantsync/vevos/extraction/kh/VariabilityAnalysis.java renamed to src/main/java/org/variantsync/vevos/extraction/kh/VariabilityAnalysis.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.variantsync.vevos.extraction.kh;
1+
package org.variantsync.vevos.extraction.kh;
22

33
import net.ssehub.kernel_haven.SetUpException;
44
import net.ssehub.kernel_haven.analysis.AnalysisComponent;

src/main/java/de/variantsync/vevos/extraction/util/ConfigManipulator.java renamed to src/main/java/org/variantsync/vevos/extraction/util/ConfigManipulator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.variantsync.vevos.extraction.util;
1+
package org.variantsync.vevos.extraction.util;
22
import net.ssehub.kernel_haven.util.Logger;
33

44
import java.io.BufferedReader;

src/main/java/de/variantsync/vevos/extraction/util/GitUtil.java renamed to src/main/java/org/variantsync/vevos/extraction/util/GitUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.variantsync.vevos.extraction.util;
1+
package org.variantsync.vevos.extraction.util;
22

33
import net.ssehub.kernel_haven.util.Logger;
44
import org.eclipse.jgit.api.Git;

src/main/java/de/variantsync/vevos/extraction/util/ShellExecutor.java renamed to src/main/java/org/variantsync/vevos/extraction/util/ShellExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.variantsync.vevos.extraction.util;
1+
package org.variantsync.vevos.extraction.util;
22

33
import net.ssehub.kernel_haven.util.Logger;
44

src/main/java/de/variantsync/vevos/extraction/util/StreamLogger.java renamed to src/main/java/org/variantsync/vevos/extraction/util/StreamLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.variantsync.vevos.extraction.util;
1+
package org.variantsync.vevos.extraction.util;
22

33
import net.ssehub.kernel_haven.util.Logger;
44

0 commit comments

Comments
 (0)