RedGuy/easy-18in
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move FolderStrategyType to right package

Browse Source
This commit is contained in:
marhali 2022-04-11 19:27:36 +02:00
parent 92d6e6604d
commit 06f03ea1e1
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/marhali/easyi18n/model/FolderStrategyType.java → src/main/java/de/marhali/easyi18n/io/folder/FolderStrategyType.java
View File

@ -1,9 +1,4 @@
package de.marhali.easyi18n.model; package de.marhali.easyi18n.io.folder;
import de.marhali.easyi18n.io.folder.FolderStrategy;
import de.marhali.easyi18n.io.folder.ModularLocaleFolderStrategy;
import de.marhali.easyi18n.io.folder.ModularNamespaceFolderStrategy;
import de.marhali.easyi18n.io.folder.SingleFolderStrategy;
/** /**
* Represents all supported folder strategies. * Represents all supported folder strategies.

5
src/main/java/de/marhali/easyi18n/io/parser/ParserStrategy.java
View File

@ -2,6 +2,7 @@ package de.marhali.easyi18n.io.parser;
import de.marhali.easyi18n.model.*; import de.marhali.easyi18n.model.*;
import de.marhali.easyi18n.model.KeyPath;
import de.marhali.easyi18n.settings.ProjectSettings; import de.marhali.easyi18n.settings.ProjectSettings;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -46,7 +47,7 @@ public abstract class ParserStrategy {
if(file.getNamespace() != null) { if(file.getNamespace() != null) {
String moduleName = file.getNamespace(); String moduleName = file.getNamespace();
TranslationNode moduleNode = data.getNode(KeyPath.of(moduleName)); TranslationNode moduleNode = data.getNode(new KeyPath(moduleName));
if(moduleNode == null) { if(moduleNode == null) {
moduleNode = new TranslationNode(this.settings.isSorting()); moduleNode = new TranslationNode(this.settings.isSorting());
@ -69,7 +70,7 @@ public abstract class ParserStrategy {
TranslationNode targetNode = data.getRootNode(); TranslationNode targetNode = data.getRootNode();
if(file.getNamespace() != null) { if(file.getNamespace() != null) {
targetNode = data.getNode(KeyPath.of(file.getNamespace())); targetNode = data.getNode(new KeyPath(file.getNamespace()));
} }
return Objects.requireNonNull(targetNode); return Objects.requireNonNull(targetNode);

2
src/main/java/de/marhali/easyi18n/settings/ProjectSettings.java
View File

@ -1,7 +1,7 @@
package de.marhali.easyi18n.settings; package de.marhali.easyi18n.settings;
import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.io.parser.ParserStrategyType;
import de.marhali.easyi18n.model.FolderStrategyType; import de.marhali.easyi18n.io.folder.FolderStrategyType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

2
src/main/java/de/marhali/easyi18n/settings/ProjectSettingsComponentState.java
View File

@ -4,7 +4,7 @@ import com.intellij.openapi.ui.ComboBox;
import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.io.parser.ParserStrategyType;
import de.marhali.easyi18n.model.FolderStrategyType; import de.marhali.easyi18n.io.folder.FolderStrategyType;
import de.marhali.easyi18n.settings.presets.Preset; import de.marhali.easyi18n.settings.presets.Preset;
import javax.swing.*; import javax.swing.*;

2
src/main/java/de/marhali/easyi18n/settings/ProjectSettingsState.java
View File

@ -1,7 +1,7 @@
package de.marhali.easyi18n.settings; package de.marhali.easyi18n.settings;
import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.io.parser.ParserStrategyType;
import de.marhali.easyi18n.model.FolderStrategyType; import de.marhali.easyi18n.io.folder.FolderStrategyType;
import de.marhali.easyi18n.settings.presets.DefaultPreset; import de.marhali.easyi18n.settings.presets.DefaultPreset;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
src/main/java/de/marhali/easyi18n/settings/presets/DefaultPreset.java
View File

@ -1,7 +1,7 @@
package de.marhali.easyi18n.settings.presets; package de.marhali.easyi18n.settings.presets;
import de.marhali.easyi18n.io.parser.ParserStrategyType; import de.marhali.easyi18n.io.parser.ParserStrategyType;
import de.marhali.easyi18n.model.FolderStrategyType; import de.marhali.easyi18n.io.folder.FolderStrategyType;
import de.marhali.easyi18n.settings.ProjectSettings; import de.marhali.easyi18n.settings.ProjectSettings;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;