Skip to content

Commit

Permalink
[GitFix] roll back to a non pushed commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@chapuisk
chapuisk committed Nov 4, 2021
2 parents c7fa752 + 6493b14 commit f5c8a5b
Show file tree
Hide file tree
Showing 112 changed files with 6,287 additions and 2,127 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/github-travis.yml
View file
Expand Up @@ -76,9 +76,6 @@ jobs:
./Gama1.7-macosx*zip
./mac-sign.sh
- run: rm ./Gama1.7-macosx*zip
if: env.CONTINUE == 'true'

- uses: actions/upload-artifact@v2
if: env.CONTINUE == 'true'
with:
Expand Down
32 changes: 20 additions & 12 deletions msi.gama.application/src/msi/gama/application/workbench/ApplicationWorkbenchAdvisor.java
View file
@@ -1,14 +1,13 @@
/*********************************************************************************************
/*******************************************************************************************************
*
* 'ApplicationWorkbenchAdvisor.java, in plugin msi.gama.application, is part of the source code of the GAMA modeling
* and simulation platform. (v. 1.8.1)
* ApplicationWorkbenchAdvisor.java, in msi.gama.application, is part of the source code of the
* GAMA modeling and simulation platform (v.1.8.2).
*
* (c) 2007-2020 UMI 209 UMMISCO IRD/UPMC & Partners
* (c) 2007-2021 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and developers contact.
*
*
**********************************************************************************************/
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
********************************************************************************************************/
package msi.gama.application.workbench;

import java.util.Arrays;
Expand Down Expand Up @@ -41,12 +40,18 @@
import msi.gama.runtime.concurrent.GamaExecutorService;
import ummisco.gama.dev.utils.DEBUG;

/**
* The Class ApplicationWorkbenchAdvisor.
*/
public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {

{
DEBUG.OFF();
}

/**
* Instantiates a new application workbench advisor.
*/
public ApplicationWorkbenchAdvisor() {
super(Application.processor);
}
Expand Down Expand Up @@ -106,6 +111,11 @@ public void postStartup() {
}
}

/**
* Check copy of built in models.
*
* @return true, if successful
*/
protected boolean checkCopyOfBuiltInModels() {

final IWorkspace workspace = ResourcesPlugin.getWorkspace();
Expand Down Expand Up @@ -177,9 +187,7 @@ protected boolean checkCopyOfBuiltInModels() {
}

@Override
public String getInitialWindowPerspectiveId() {
return IGui.PERSPECTIVE_MODELING_ID;
}
public String getInitialWindowPerspectiveId() { return IGui.PERSPECTIVE_MODELING_ID; }

/**
* A workbench pre-shutdown method calls to prompt a confirmation of the shutdown and perform a saving of the
Expand Down Expand Up @@ -216,7 +224,7 @@ public void preStartup() {
Job.getJobManager().suspend();
// super.preStartup();
/* Linking the stock models with the workspace if they are not already */
if (checkCopyOfBuiltInModels()) { WorkspaceModelsManager.linkSampleModelsToWorkspace(); }
if (checkCopyOfBuiltInModels()) { WorkspaceModelsManager.instance.linkSampleModelsToWorkspace(); }

}

Expand Down
132 changes: 66 additions & 66 deletions msi.gama.application/src/msi/gama/application/workspace/PickWorkspaceDialog.java
View file
@@ -1,21 +1,26 @@
/*********************************************************************************************
/*******************************************************************************************************
*
* 'PickWorkspaceDialog.java, in plugin msi.gama.application, is part of the source code of the GAMA modeling and
* simulation platform. (v. 1.8.1)
* PickWorkspaceDialog.java, in msi.gama.application, is part of the source code of the GAMA modeling and simulation
* platform (v.1.8.2).
*
* (c) 2007-2020 UMI 209 UMMISCO IRD/UPMC & Partners
* (c) 2007-2021 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and developers contact.
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
*
**********************************************************************************************/
********************************************************************************************************/
package msi.gama.application.workspace;

// import java.awt.GridLayout;
import java.io.File;
import java.io.IOException;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

Expand All @@ -35,8 +40,6 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

import com.google.common.io.Files;

/**
* Dialog that lets/forces a user to enter/select a workspace that will be used when saving all configuration files and
* settings. This dialog is shown at startup of the GUI just after the splash screen has shown. Inspired by
Expand All @@ -51,22 +54,36 @@ public class PickWorkspaceDialog extends TitleAreaDialog {
// 240.

// static Preferences preferences = Preferences.userRoot().node("gama");
/** The Constant strMsg. */
/* Various dialog messages */
private static final String strMsg =
"Your workspace is where settings and files of your Gama models will be stored.";

/** The Constant strInfo. */
private static final String strInfo = "Please select a directory that will be the workspace root";

/** The Constant strError. */
private static final String strError = "You must set a directory";

/** The workspace path combo. */
/* Our controls */
protected Combo workspacePathCombo;

/** The last used workspaces. */
protected List<String> lastUsedWorkspaces;

/** The remember workspace button. */
protected Button rememberWorkspaceButton;

/** The Constant splitChar. */
/* Used as separator when we save the last used workspace locations */
private static final String splitChar = "#";

/** The Constant maxHistory. */
/* Max number of entries in the history box */
private static final int maxHistory = 20;

/** The cloning. */
/* Whatever the user picks ends up on this variable */
private boolean cloning = false;

Expand Down Expand Up @@ -130,9 +147,7 @@ protected Control createDialogArea(final Composite parent) {
final String[] all = lastUsed.split(splitChar);
Collections.addAll(lastUsedWorkspaces, all);
}
for (final String last : lastUsedWorkspaces) {
workspacePathCombo.add(last);
}
for (final String last : lastUsedWorkspaces) { workspacePathCombo.add(last); }

/* Browse button on the right */
final Button browse = new Button(inner, SWT.PUSH);
Expand Down Expand Up @@ -163,21 +178,7 @@ protected Control createDialogArea(final Composite parent) {
*
* @return Path
*/
public String getSelectedWorkspaceLocation() {
return WorkspacePreferences.getSelectedWorkspaceRootLocation();
}

/* Suggests a default path based on the user.home/GAMA directory location */
private String getWorkspacePathSuggestion() {
final StringBuilder buf = new StringBuilder();

String uHome = System.getProperty("user.home");
if (uHome == null) { uHome = "c:"; }

buf.append(uHome).append(File.separator).append("gama_workspace");

return buf.toString();
}
public String getSelectedWorkspaceLocation() { return WorkspacePreferences.getSelectedWorkspaceRootLocation(); }

@Override
protected void createButtonsForButtonBar(final Composite parent) {
Expand All @@ -190,47 +191,48 @@ protected void createButtonsForButtonBar(final Composite parent) {
}

/**
* This function will copy files or directories from one location to another. note that the source and the
* destination must be mutually exclusive. This function can not be used to copy a directory to a sub directory of
* itself. The function will also have problems if the destination files already exist.
* Copy one absolute path over another
*
* @param src
* -- A File object that represents the source for the copy
* @param dest
* -- A File object that represents the destination for the copy.
* @param source
* the source
* @param t
* the t
* @param override
* the override
* @throws IOException
* if unable to copy.
* Signals that an I/O exception has occurred.
*/
public static void copyFiles(final File src, final File dest) throws IOException {
static void copy(final File src, final File dest) throws IOException {
/* Check to ensure that the source is valid... */
if (!src.exists()) throw new IOException("Can not find source: " + src.getAbsolutePath());
if (!src.canRead())
throw new IOException("Cannot read: " + src.getAbsolutePath() + ". Check file permissions.");
/* Is this a directory copy? */
final List<String> noCopy = Arrays.asList("org.eclipse.core.runtime", "org.eclipse.e4.workbench",
"org.eclipse.emf.common.ui", "org.eclipse.ui.workbench", "org.eclipse.xtext.builder");
if (src.isDirectory()) {
if (noCopy.contains(src.getName())) return;
/* Does the destination already exist? */
/* If not we need to make it exist if possible */
if (!dest.exists() && !dest.mkdirs())
throw new IOException("Could not create direcotry: " + dest.getAbsolutePath());
/* Get a listing of files... */
final String list[] = src.list();
/* Copy all the files in the list. */
if (list != null) {
for (final String element : list) {
final File dest1 = new File(dest, element);
final File src1 = new File(src, element);
copyFiles(src1, dest1);
}
Path source = src.toPath();
Path target = dest.toPath();
if (Files.notExists(source)) throw new IOException("Can not find: " + source);
if (!Files.isReadable(source)) throw new IOException("Cannot read: " + source);
if (source.startsWith(target) || target.startsWith(source)) throw new IOException(
"Source (" + source + ") and destination (" + target + ") must be separate directories");
Files.walkFileTree(source, new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult preVisitDirectory(final Path dir, final BasicFileAttributes attrs)
throws IOException {
if (dir.toString().contains("org.eclipse") && !"org.eclipse.core.resources".equals(dir.toString()))
return FileVisitResult.SKIP_SUBTREE;
Files.createDirectories(target.resolve(source.relativize(dir)));
return FileVisitResult.CONTINUE;
}
} else {
/* This was not a directory, so lets just copy the file */
Files.copy(src, dest);
}

@Override
public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
Files.copy(file, target.resolve(source.relativize(file)), LinkOption.NOFOLLOW_LINKS,
StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING);
return FileVisitResult.CONTINUE;
}

});
}

/**
* Clone current workspace.
*/
protected void cloneCurrentWorkspace() {
final String currentLocation = WorkspacePreferences.getLastSetWorkspaceDirectory();
if (currentLocation == null || currentLocation.isEmpty()) {
Expand Down Expand Up @@ -276,9 +278,7 @@ protected void okPressed() {
/* Deal with the max history */
if (lastUsedWorkspaces.size() > maxHistory) {
final List<String> remove = new ArrayList<>();
for (int i = maxHistory; i < lastUsedWorkspaces.size(); i++) {
remove.add(lastUsedWorkspaces.get(i));
}
for (int i = maxHistory; i < lastUsedWorkspaces.size(); i++) { remove.add(lastUsedWorkspaces.get(i)); }

lastUsedWorkspaces.removeAll(remove);
}
Expand Down Expand Up @@ -323,7 +323,7 @@ protected void okPressed() {
if (workspaceDirectory != null) {
final File targetDirectory = new File(str);
try {
copyFiles(workspaceDirectory, targetDirectory);
copy(workspaceDirectory, targetDirectory);
// WorkspacePreferences.setApplyPrefs(true);
} catch (final Exception err) {
MessageDialog.openError(Display.getDefault().getActiveShell(), "Error",
Expand Down

0 comments on commit f5c8a5b

Please sign in to comment.