Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use wording "WinePrefixContainer*" #609

Merged
merged 1 commit into from Feb 19, 2017
Merged

use wording "WinePrefixContainer*" #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions phoenicis-containers/src/main/java/org/phoenicis/containers/ContainersConfiguration.java
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@

package org.phoenicis.containers;

import org.phoenicis.containers.wine.WineContainerController;
import org.phoenicis.containers.wine.WinePrefixesManager;
import org.phoenicis.containers.wine.WinePrefixContainerController;
import org.phoenicis.containers.wine.WinePrefixContainersManager;
import org.phoenicis.containers.wine.configurations.*;
import org.phoenicis.library.LibraryConfiguration;
import org.phoenicis.multithreading.MultithreadingConfiguration;
Expand Down Expand Up @@ -53,7 +53,7 @@ public class ContainersConfiguration {

@Bean
public ContainersManager containersManager() {
return new WinePrefixesManager(
return new WinePrefixContainersManager(
toolsConfiguration.compatibleConfigFileFormatFactory(),
winePrefixDisplayConfiguration(),
winePrefixInputConfiguration()
Expand All @@ -66,8 +66,8 @@ public ContainersManager backgroundContainersManager() {
}

@Bean
public WineContainerController wineContainerController() {
return new WineContainerController(
public WinePrefixContainerController winePrefixContainerController() {
return new WinePrefixContainerController(
scriptsConfiguration.scriptInterpreter(),
toolsConfiguration.terminalOpener(),
wineEnginesPath,
Expand All @@ -80,12 +80,12 @@ public WineContainerController wineContainerController() {
}

@Bean
WinePrefixInputConfiguration winePrefixInputConfiguration() {
return new RegistryWinePrefixInputConfiguration(win32Configuration.registryParser(), new DefaultWinePrefixInputConfiguration());
WinePrefixContainerInputConfiguration winePrefixInputConfiguration() {
return new RegistryWinePrefixContainerInputConfiguration(win32Configuration.registryParser(), new DefaultWinePrefixContainerInputConfiguration());
}

@Bean
WinePrefixDisplayConfiguration winePrefixDisplayConfiguration() {
return new RegistryWinePrefixDisplayConfiguration(win32Configuration.registryParser(), new DefaultWinePrefixDisplayConfiguration());
WinePrefixContainerDisplayConfiguration winePrefixDisplayConfiguration() {
return new RegistryWinePrefixContainerDisplayConfiguration(win32Configuration.registryParser(), new DefaultWinePrefixContainerDisplayConfiguration());
}
}
8 changes: 4 additions & 4 deletions ...oenicis/containers/dto/WinePrefixDTO.java → ...ontainers/dto/WinePrefixContainerDTO.java
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@

import org.phoenicis.containers.wine.parameters.*;

public class WinePrefixDTO extends ContainerDTO {
public class WinePrefixContainerDTO extends ContainerDTO {
private final String architecture;
private final String distribution;
private final String version;
Expand All @@ -34,7 +34,7 @@ public class WinePrefixDTO extends ContainerDTO {
private final RenderTargetModeLock renderTargetModeLock;
private final MouseWarpOverride mouseWarpOverride;

private WinePrefixDTO(Builder builder) {
private WinePrefixContainerDTO(Builder builder) {
super(builder.name, builder.path, ContainerType.WINEPREFIX);
this.architecture = builder.architecture;
this.distribution = builder.distribution;
Expand Down Expand Up @@ -184,8 +184,8 @@ public Builder withMouseWarpOverride(MouseWarpOverride mouseWarpOverride) {
return this;
}

public WinePrefixDTO build() {
return new WinePrefixDTO(this);
public WinePrefixContainerDTO build() {
return new WinePrefixContainerDTO(this);
}
}
}
48 changes: 24 additions & 24 deletions ...tainers/wine/WineContainerController.java → ...s/wine/WinePrefixContainerController.java
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
package org.phoenicis.containers.wine;

import jdk.nashorn.api.scripting.ScriptObjectMirror;
import org.phoenicis.containers.dto.WinePrefixDTO;
import org.phoenicis.containers.dto.WinePrefixContainerDTO;
import org.phoenicis.containers.wine.parameters.RegistryParameter;
import org.phoenicis.library.LibraryManager;
import org.phoenicis.library.ShortcutManager;
Expand All @@ -40,8 +40,8 @@
import java.util.Map;
import java.util.function.Consumer;

public class WineContainerController {
private static final Logger LOGGER = LoggerFactory.getLogger(WineContainerController.class);
public class WinePrefixContainerController {
private static final Logger LOGGER = LoggerFactory.getLogger(WinePrefixContainerController.class);
private final ScriptInterpreter scriptInterpreter;
private final TerminalOpener terminalOpener;
private final String wineEnginesPath;
Expand All @@ -51,14 +51,14 @@ public class WineContainerController {
private final ShortcutManager shortcutManager;
private final FileUtilities fileUtilities;

public WineContainerController(ScriptInterpreter scriptInterpreter,
TerminalOpener terminalOpener,
String wineEnginesPath,
OperatingSystemFetcher operatingSystemFetcher,
RegistryWriter registryWriter,
LibraryManager libraryManager,
ShortcutManager shortcutManager,
FileUtilities fileUtilities) {
public WinePrefixContainerController(ScriptInterpreter scriptInterpreter,
TerminalOpener terminalOpener,
String wineEnginesPath,
OperatingSystemFetcher operatingSystemFetcher,
RegistryWriter registryWriter,
LibraryManager libraryManager,
ShortcutManager shortcutManager,
FileUtilities fileUtilities) {
this.scriptInterpreter = scriptInterpreter;
this.terminalOpener = terminalOpener;
this.wineEnginesPath = wineEnginesPath;
Expand All @@ -69,7 +69,7 @@ public WineContainerController(ScriptInterpreter scriptInterpreter,
this.fileUtilities = fileUtilities;
}

public void repairPrefix(WinePrefixDTO winePrefix,
public void repairPrefix(WinePrefixContainerDTO winePrefix,
Runnable doneCallback,
Consumer<Exception> errorCallback) {
// FIXME
Expand All @@ -90,7 +90,7 @@ public void repairPrefix(WinePrefixDTO winePrefix,
);
}

public void killProcesses(WinePrefixDTO winePrefix,
public void killProcesses(WinePrefixContainerDTO winePrefix,
Runnable doneCallback,
Consumer<Exception> errorCallback) {
final InteractiveScriptSession interactiveScriptSession = scriptInterpreter.createInteractiveSession();
Expand All @@ -109,7 +109,7 @@ public void killProcesses(WinePrefixDTO winePrefix,
);
}

public void changeSetting(WinePrefixDTO winePrefix,
public void changeSetting(WinePrefixContainerDTO winePrefix,
RegistryParameter setting,
Runnable doneCallback,
Consumer<Exception> errorCallback) {
Expand All @@ -135,7 +135,7 @@ public void changeSetting(WinePrefixDTO winePrefix,
);
}

public void runInPrefix(WinePrefixDTO winePrefix,
public void runInPrefix(WinePrefixContainerDTO winePrefix,
String command,
Runnable doneCallback,
Consumer<Exception> errorCallback) {
Expand All @@ -156,7 +156,7 @@ public void runInPrefix(WinePrefixDTO winePrefix,
);
}

public void deletePrefix(WinePrefixDTO winePrefix,
public void deletePrefix(WinePrefixContainerDTO winePrefix,
Consumer<Exception> errorCallback) {
try {
fileUtilities.remove(new File(winePrefix.getPath()));
Expand Down Expand Up @@ -185,22 +185,22 @@ public void deletePrefix(WinePrefixDTO winePrefix,
}
}

public void openTerminalInPrefix(WinePrefixDTO winePrefixDTO) {
public void openTerminalInPrefix(WinePrefixContainerDTO winePrefixContainerDTO) {
final Map<String, String> environment = new HashMap<>();
environment.put("WINEPREFIX", winePrefixDTO.getPath());
environment.put("PATH", fetchWineVersionPath(winePrefixDTO) + "/bin/" + ":$PATH");
terminalOpener.openTerminal(winePrefixDTO.getPath(), environment);
environment.put("WINEPREFIX", winePrefixContainerDTO.getPath());
environment.put("PATH", fetchWineVersionPath(winePrefixContainerDTO) + "/bin/" + ":$PATH");
terminalOpener.openTerminal(winePrefixContainerDTO.getPath(), environment);
}

private String fetchWineVersionPath(WinePrefixDTO winePrefixDTO) {
private String fetchWineVersionPath(WinePrefixContainerDTO winePrefixContainerDTO) {
return wineEnginesPath +
"/" +
winePrefixDTO.getDistribution() +
winePrefixContainerDTO.getDistribution() +
"-" +
operatingSystemFetcher.fetchCurrentOperationSystem().getWinePackage() +
"-" +
winePrefixDTO.getArchitecture() +
winePrefixContainerDTO.getArchitecture() +
"/" +
winePrefixDTO.getVersion();
winePrefixContainerDTO.getVersion();
}
}
42 changes: 21 additions & 21 deletions .../containers/wine/WinePrefixesManager.java → ...ers/wine/WinePrefixContainersManager.java
View file
Open in desktop
Expand Up @@ -20,9 +20,9 @@

import org.phoenicis.containers.ContainersManager;
import org.phoenicis.containers.dto.ContainerDTO;
import org.phoenicis.containers.dto.WinePrefixDTO;
import org.phoenicis.containers.wine.configurations.WinePrefixDisplayConfiguration;
import org.phoenicis.containers.wine.configurations.WinePrefixInputConfiguration;
import org.phoenicis.containers.dto.WinePrefixContainerDTO;
import org.phoenicis.containers.wine.configurations.WinePrefixContainerDisplayConfiguration;
import org.phoenicis.containers.wine.configurations.WinePrefixContainerInputConfiguration;
import org.phoenicis.tools.config.CompatibleConfigFileFormatFactory;
import org.phoenicis.tools.config.ConfigFile;
import org.springframework.beans.factory.annotation.Value;
Expand All @@ -33,20 +33,20 @@
import java.util.List;
import java.util.function.Consumer;

public class WinePrefixesManager implements ContainersManager {
public class WinePrefixContainersManager implements ContainersManager {
@Value("${application.user.wineprefix}")
private String winePrefixPath;

private final CompatibleConfigFileFormatFactory compatibleConfigFileFormatFactory;
private final WinePrefixDisplayConfiguration winePrefixDisplayConfiguration;
private final WinePrefixInputConfiguration winePrefixInputConfiguration;
private final WinePrefixContainerDisplayConfiguration winePrefixContainerDisplayConfiguration;
private final WinePrefixContainerInputConfiguration winePrefixContainerInputConfiguration;

public WinePrefixesManager(CompatibleConfigFileFormatFactory compatibleConfigFileFormatFactory,
WinePrefixDisplayConfiguration winePrefixDisplayConfiguration,
WinePrefixInputConfiguration winePrefixInputConfiguration) {
public WinePrefixContainersManager(CompatibleConfigFileFormatFactory compatibleConfigFileFormatFactory,
WinePrefixContainerDisplayConfiguration winePrefixContainerDisplayConfiguration,
WinePrefixContainerInputConfiguration winePrefixContainerInputConfiguration) {
this.compatibleConfigFileFormatFactory = compatibleConfigFileFormatFactory;
this.winePrefixDisplayConfiguration = winePrefixDisplayConfiguration;
this.winePrefixInputConfiguration = winePrefixInputConfiguration;
this.winePrefixContainerDisplayConfiguration = winePrefixContainerDisplayConfiguration;
this.winePrefixContainerInputConfiguration = winePrefixContainerInputConfiguration;
}

@Override
Expand All @@ -65,21 +65,21 @@ public void fetchContainers(Consumer<List<ContainerDTO>> callback, Consumer<Exce
final File userRegistryFile = new File(winePrefix, "user.reg");

containers.add(
new WinePrefixDTO.Builder()
new WinePrefixContainerDTO.Builder()
.withName(winePrefix.getName())
.withPath(winePrefix.getAbsolutePath())
.withArchitecture(configFile.readValue("wineArchitecture", ""))
.withDistribution(configFile.readValue("wineDistribution", ""))
.withVersion(configFile.readValue("wineVersion", ""))
.withGlslValue(winePrefixDisplayConfiguration.getGLSL(userRegistryFile))
.withDirectDrawRenderer(winePrefixDisplayConfiguration.getDirectDrawRenderer(userRegistryFile))
.withVideoMemorySize(winePrefixDisplayConfiguration.getVideoMemorySize(userRegistryFile))
.withOffscreenRenderingMode(winePrefixDisplayConfiguration.getOffscreenRenderingMode(userRegistryFile))
.withMultisampling(winePrefixDisplayConfiguration.getMultisampling(userRegistryFile))
.withAlwaysOffscreen(winePrefixDisplayConfiguration.getAlwaysOffscreen(userRegistryFile))
.withStrictDrawOrdering(winePrefixDisplayConfiguration.getStrictDrawOrdering(userRegistryFile))
.withRenderTargetModeLock(winePrefixDisplayConfiguration.getRenderTargetModeLock(userRegistryFile))
.withMouseWarpOverride(winePrefixInputConfiguration.getMouseWarpOverride(userRegistryFile))
.withGlslValue(winePrefixContainerDisplayConfiguration.getGLSL(userRegistryFile))
.withDirectDrawRenderer(winePrefixContainerDisplayConfiguration.getDirectDrawRenderer(userRegistryFile))
.withVideoMemorySize(winePrefixContainerDisplayConfiguration.getVideoMemorySize(userRegistryFile))
.withOffscreenRenderingMode(winePrefixContainerDisplayConfiguration.getOffscreenRenderingMode(userRegistryFile))
.withMultisampling(winePrefixContainerDisplayConfiguration.getMultisampling(userRegistryFile))
.withAlwaysOffscreen(winePrefixContainerDisplayConfiguration.getAlwaysOffscreen(userRegistryFile))
.withStrictDrawOrdering(winePrefixContainerDisplayConfiguration.getStrictDrawOrdering(userRegistryFile))
.withRenderTargetModeLock(winePrefixContainerDisplayConfiguration.getRenderTargetModeLock(userRegistryFile))
.withMouseWarpOverride(winePrefixContainerInputConfiguration.getMouseWarpOverride(userRegistryFile))
.build()
);
}
Expand Down
2 changes: 1 addition & 1 deletion ...efaultWinePrefixDisplayConfiguration.java → ...ePrefixContainerDisplayConfiguration.java
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@

import java.io.File;

public class DefaultWinePrefixDisplayConfiguration implements WinePrefixDisplayConfiguration {
public class DefaultWinePrefixContainerDisplayConfiguration implements WinePrefixContainerDisplayConfiguration {
@Override
public UseGLSL getGLSL(File registryFile) {
return UseGLSL.DEFAULT;
Expand Down
2 changes: 1 addition & 1 deletion .../DefaultWinePrefixInputConfiguration.java → ...inePrefixContainerInputConfiguration.java
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@

import java.io.File;

public class DefaultWinePrefixInputConfiguration implements WinePrefixInputConfiguration {
public class DefaultWinePrefixContainerInputConfiguration implements WinePrefixContainerInputConfiguration {
@Override
public MouseWarpOverride getMouseWarpOverride(File registryFile) {
return MouseWarpOverride.DEFAULT;
Expand Down
6 changes: 3 additions & 3 deletions ...gistryWinePrefixDisplayConfiguration.java → ...ePrefixContainerDisplayConfiguration.java
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@

import java.io.File;

public class RegistryWinePrefixDisplayConfiguration implements WinePrefixDisplayConfiguration {
public class RegistryWinePrefixContainerDisplayConfiguration implements WinePrefixContainerDisplayConfiguration {
private static final String READTEX = "readtex";
private static final String READDRAW = "readdraw";
private static final String PBUFFER = "pbuffer";
Expand All @@ -50,9 +50,9 @@ public class RegistryWinePrefixDisplayConfiguration implements WinePrefixDisplay
private static final String HKEY_CURRENT_USER = "HKEY_CURRENT_USER";

private final RegistryParser registryParser;
private final WinePrefixDisplayConfiguration defaultConfiguration;
private final WinePrefixContainerDisplayConfiguration defaultConfiguration;

public RegistryWinePrefixDisplayConfiguration(RegistryParser registryParser, WinePrefixDisplayConfiguration defaultConfiguration) {
public RegistryWinePrefixContainerDisplayConfiguration(RegistryParser registryParser, WinePrefixContainerDisplayConfiguration defaultConfiguration) {
this.defaultConfiguration = defaultConfiguration;
this.registryParser = registryParser;
}
Expand Down
6 changes: 3 additions & 3 deletions ...RegistryWinePrefixInputConfiguration.java → ...inePrefixContainerInputConfiguration.java
View file
Open in desktop
Expand Up @@ -25,11 +25,11 @@

import java.io.File;

public class RegistryWinePrefixInputConfiguration implements WinePrefixInputConfiguration {
public class RegistryWinePrefixContainerInputConfiguration implements WinePrefixContainerInputConfiguration {
private final RegistryParser registryParser;
private final WinePrefixInputConfiguration defaultConfiguration;
private final WinePrefixContainerInputConfiguration defaultConfiguration;

public RegistryWinePrefixInputConfiguration(RegistryParser registryParser, WinePrefixInputConfiguration defaultConfiguration) {
public RegistryWinePrefixContainerInputConfiguration(RegistryParser registryParser, WinePrefixContainerInputConfiguration defaultConfiguration) {
this.registryParser = registryParser;
this.defaultConfiguration = defaultConfiguration;
}
Expand Down
2 changes: 1 addition & 1 deletion ...tions/WinePrefixDisplayConfiguration.java → ...ePrefixContainerDisplayConfiguration.java
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@

import java.io.File;

public interface WinePrefixDisplayConfiguration {
public interface WinePrefixContainerDisplayConfiguration {
/**
*
* @return The {@link UseGLSL} value
Expand Down
2 changes: 1 addition & 1 deletion ...rations/WinePrefixInputConfiguration.java → ...inePrefixContainerInputConfiguration.java
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@

import java.io.File;

public interface WinePrefixInputConfiguration {
public interface WinePrefixContainerInputConfiguration {
/**
*
* @return The {@link MouseWarpOverride} value
Expand Down
4 changes: 2 additions & 2 deletions phoenicis-javafx/src/main/java/org/phoenicis/javafx/controller/ControllerConfiguration.java
View file
Open in desktop
Expand Up @@ -88,8 +88,8 @@ public ContainersController containersController() {
return new ContainersController(
viewsConfiguration.viewContainers(),
containersConfiguration.backgroundContainersManager(),
viewsConfiguration.wineContainerPanelFactory(),
containersConfiguration.wineContainerController()
viewsConfiguration.winePrefixContainerPanelFactory(),
containersConfiguration.winePrefixContainerController()
);
}

Expand Down