Skip to content

Commit 41a683f

Browse files
committed
v0.30.0
2 parents 7f43ec3 + 5ae3f82 commit 41a683f

File tree

134 files changed

+1758
-852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+1758
-852
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
- Have the source found where it is defined in the beam when default search fails. [\#220](https://github.com/erlide/erlide/pull/220) ([zsoci](https://github.com/zsoci))
3232

3333

34-
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
34+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

CHANGES

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
List of user visible changes between 0.29.13 and 0.30.0 (20151103)
2+
3+
806d2a3 #235 - recognize more types of version numbers
4+
7c2402f #241 - remove headless feature
5+
cc94717 #238 - cache hostname values to speed up startup
6+
2e401bf debugger: catch missing bundles
7+
40f0552 #233 - improve launch "runtime" tab to make it clearer
8+
75c8fb8 #230 - detect kerl and its installations
9+
110
List of user visible changes between 0.29.11 and 0.29.12 (20150710)
211

312
dca59f3 #229 - epp error, unable to build automatically

org.erlide.backend/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.erlide.backend;singleton:=true
5-
Bundle-Version: 0.24.17.qualifier
5+
Bundle-Version: 0.24.18.qualifier
66
Bundle-ClassPath: .
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

org.erlide.backend/src/org/erlide/backend/api/BackendData.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
/*******************************************************************************
2-
* Copyright (c) 2008 Vlad Dumitrescu and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution, and is available at
2+
* Copyright (c) 2008 Vlad Dumitrescu and others. All rights reserved. This program and
3+
* the accompanying materials are made available under the terms of the Eclipse Public
4+
* License v1.0 which accompanies this distribution, and is available at
65
* http://www.eclipse.org/legal/epl-v10.html
76
*
8-
* Contributors:
9-
* Vlad Dumitrescu
7+
* Contributors: Vlad Dumitrescu
108
*******************************************************************************/
119
package org.erlide.backend.api;
1210

@@ -41,7 +39,7 @@
4139
import org.erlide.runtime.runtimeinfo.RuntimeVersion;
4240
import org.erlide.util.ErlLogger;
4341
import org.erlide.util.ErlangFunctionCall;
44-
import org.erlide.util.HostnameUtils;
42+
import org.erlide.util.HostnameChecker;
4543

4644
import com.google.common.base.Charsets;
4745
import com.google.common.collect.Lists;
@@ -71,8 +69,8 @@ public BackendData(@NonNull final RuntimeInfo info,
7169
nodeName = config.getAttribute(ErlRuntimeAttributes.NODE_NAME, nodeName);
7270
longName = config.getAttribute(ErlRuntimeAttributes.USE_LONG_NAME, longName);
7371
extraArgs = config.getAttribute(ErlRuntimeAttributes.EXTRA_ARGS, extraArgs);
74-
workingDir = config
75-
.getAttribute(ErlRuntimeAttributes.WORKING_DIR, workingDir);
72+
workingDir = config.getAttribute(ErlRuntimeAttributes.WORKING_DIR,
73+
workingDir);
7674
env = config.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, env);
7775
initialCall = createInitialCall(config);
7876
debugFlags = ErlDebugFlags.makeSet(config.getAttribute(
@@ -83,8 +81,8 @@ public BackendData(@NonNull final RuntimeInfo info,
8381

8482
projects = getProjects(config);
8583
final List<String> defList = Lists.newArrayList();
86-
final List<String> intMods = config.getAttribute(
87-
ErlRuntimeAttributes.DEBUG_INTERPRET_MODULES, defList);
84+
final List<String> intMods = config
85+
.getAttribute(ErlRuntimeAttributes.DEBUG_INTERPRET_MODULES, defList);
8886
initialInterpretedModules = addBreakpointProjectsAndModules(getProjects(),
8987
intMods);
9088
} catch (final CoreException e1) {
@@ -157,8 +155,8 @@ public void setLaunch(final ILaunch launch) {
157155

158156
public ILaunchConfiguration asLaunchConfiguration() {
159157
final ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
160-
final ILaunchConfigurationType type = manager
161-
.getLaunchConfigurationType(IErlangLaunchDelegateConstants.CONFIGURATION_TYPE_INTERNAL);
158+
final ILaunchConfigurationType type = manager.getLaunchConfigurationType(
159+
IErlangLaunchDelegateConstants.CONFIGURATION_TYPE_INTERNAL);
162160
ILaunchConfigurationWorkingCopy workingCopy;
163161
try {
164162
final RuntimeInfo info = getRuntimeInfo();
@@ -198,8 +196,8 @@ private Collection<IProject> getProjects(final ILaunchConfiguration config)
198196
throws CoreException {
199197
String prjs;
200198
prjs = config.getAttribute(ErlRuntimeAttributes.PROJECTS, "");
201-
final String[] projectNames = prjs.length() == 0 ? new String[] {} : prjs
202-
.split(PROJECT_NAME_SEPARATOR);
199+
final String[] projectNames = prjs.length() == 0 ? new String[] {}
200+
: prjs.split(PROJECT_NAME_SEPARATOR);
203201
return gatherProjects(projectNames);
204202
}
205203

@@ -213,7 +211,8 @@ public IBeamLocator getBeamLocator() {
213211

214212
@Override
215213
public String getQualifiedNodeName() {
216-
final String erlangHostName = HostnameUtils.getErlangHostName(hasLongName());
214+
final String erlangHostName = HostnameChecker.getInstance()
215+
.getErlangHostName(hasLongName());
217216
final String name = getNodeName();
218217
final boolean hasHost = name.contains("@");
219218
return hasHost ? name : name + "@" + erlangHostName;

org.erlide.backend/src/org/erlide/backend/debug/model/ErlangDebugTarget.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,12 +580,20 @@ private void addNodesAsDebugTargets(final ILaunch aLaunch) {
580580

581581
private List<String> getDebuggerModules() {
582582
final Bundle debugger = Platform.getBundle("org.erlide.kernel.debugger");
583+
if (debugger == null) {
584+
ErlLogger.warn("debugger bundle was not found...");
585+
return new ArrayList<String>();
586+
}
583587
final List<String> dbg_modules = getModulesFromBundle(debugger);
584588

585589
final String ver = backend.getRuntime().getVersion().asMajor().toString()
586590
.toLowerCase();
587-
final Bundle debugger_otp = Platform.getBundle("org.erlide.kernel.debugger.otp."
588-
+ ver);
591+
final Bundle debugger_otp = Platform
592+
.getBundle("org.erlide.kernel.debugger.otp." + ver);
593+
if (debugger_otp == null) {
594+
ErlLogger.warn("debugger %s bundle was not found...", ver);
595+
return dbg_modules;
596+
}
589597
final List<String> dbg_otp_modules = getModulesFromBundle(debugger_otp);
590598

591599
dbg_modules.addAll(dbg_otp_modules);

org.erlide.backend/src/org/erlide/backend/internal/BackendFactory.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
/*******************************************************************************
2-
* Copyright (c) 2005-2011 Vlad Dumitrescu and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution, and is available at
2+
* Copyright (c) 2005-2011 Vlad Dumitrescu and others. All rights reserved. This program
3+
* and the accompanying materials are made available under the terms of the Eclipse Public
4+
* License v1.0 which accompanies this distribution, and is available at
65
* http://www.eclipse.org/legal/epl-v10.html
76
*
8-
* Contributors:
9-
* Vlad Dumitrescu
7+
* Contributors: Vlad Dumitrescu
108
*******************************************************************************/
119
package org.erlide.backend.internal;
1210

@@ -25,7 +23,7 @@
2523
import org.erlide.runtime.runtimeinfo.IRuntimeInfoCatalog;
2624
import org.erlide.runtime.runtimeinfo.RuntimeInfo;
2725
import org.erlide.util.ErlLogger;
28-
import org.erlide.util.HostnameUtils;
26+
import org.erlide.util.HostnameChecker;
2927
import org.erlide.util.SystemConfiguration;
3028

3129
public class BackendFactory implements IBackendFactory {
@@ -82,8 +80,8 @@ private BackendData getIdeBackendData() {
8280
result.setConsole(SystemConfiguration.getInstance().isDeveloper());
8381
result.setManaged(true);
8482
result.setRestartable(true);
85-
result.setLongName(SystemConfiguration.hasFeatureEnabled("erlide.shortname") ? false
86-
: HostnameUtils.canUseLongNames());
83+
result.setLongName(SystemConfiguration.hasFeatureEnabled("erlide.shortname")
84+
? false : HostnameChecker.getInstance().canUseLongNames());
8785
result.setInternal(true);
8886
result.setReportErrors(true);
8987
result.setContext(CodeContext.IDE);
@@ -101,7 +99,7 @@ private BackendData getBuildBackendData(final @NonNull RuntimeInfo info) {
10199
result.setDebug(false);
102100
result.setManaged(true);
103101
result.setConsole(false);
104-
result.setLongName(HostnameUtils.canUseLongNames());
102+
result.setLongName(HostnameChecker.getInstance().canUseLongNames());
105103
result.setInternal(true);
106104
result.setReportErrors(true);
107105
result.setContext(CodeContext.IDE);

org.erlide.backend/src/org/erlide/backend/launch/ErlangLaunchDelegate.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
/*******************************************************************************
2-
* Copyright (c) 2005 Vlad Dumitrescu and others.
3-
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution, and is available at
2+
* Copyright (c) 2005 Vlad Dumitrescu and others. All rights reserved. This program and
3+
* the accompanying materials are made available under the terms of the Eclipse Public
4+
* License v1.0 which accompanies this distribution, and is available at
65
* http://www.eclipse.org/legal/epl-v10.html
76
*
8-
* Contributors:
9-
* Vlad Dumitrescu
10-
* Jakob Cederlund
7+
* Contributors: Vlad Dumitrescu Jakob Cederlund
118
*******************************************************************************/
129
package org.erlide.backend.launch;
1310

@@ -32,7 +29,7 @@
3229
import org.erlide.runtime.epmd.EpmdWatcher;
3330
import org.erlide.runtime.runtimeinfo.RuntimeInfo;
3431
import org.erlide.util.ErlLogger;
35-
import org.erlide.util.HostnameUtils;
32+
import org.erlide.util.HostnameChecker;
3633

3734
import com.google.common.base.Preconditions;
3835
import com.google.common.collect.Maps;
@@ -70,8 +67,8 @@ private BackendData getBackendData(final ILaunchConfiguration config,
7067
throw new IllegalArgumentException();
7168
}
7269

73-
RuntimeInfo runtimeInfo = BackendCore.getRuntimeInfoCatalog().getRuntime(
74-
config.getAttribute(ErlRuntimeAttributes.RUNTIME_NAME, ""));
70+
RuntimeInfo runtimeInfo = BackendCore.getRuntimeInfoCatalog()
71+
.getRuntime(config.getAttribute(ErlRuntimeAttributes.RUNTIME_NAME, ""));
7572
if (runtimeInfo == null) {
7673
runtimeInfo = BackendCore.getRuntimeInfoCatalog().getDefaultRuntime();
7774
}
@@ -154,7 +151,7 @@ private static boolean shouldManageNode(final String name,
154151
boolean isLocal = atSignIndex < 0;
155152
if (atSignIndex > 0) {
156153
final String hostname = name.substring(atSignIndex + 1);
157-
if (HostnameUtils.isThisHost(hostname)) {
154+
if (HostnameChecker.getInstance().isThisHost(hostname)) {
158155
isLocal = true;
159156
}
160157
}

org.erlide.core.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: erlide core Tests Fragment
44
Bundle-SymbolicName: org.erlide.core.tests;singleton:=true
5-
Bundle-Version: 0.24.7.qualifier
5+
Bundle-Version: 0.24.8.qualifier
66
Bundle-Vendor: erlide.org
77
Fragment-Host: org.erlide.core;bundle-version="0.14.0"
88
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

org.erlide.core.tests/src/org/erlide/core/services/builder/ToolExecutorTests.java renamed to org.erlide.core.tests/src/org/erlide/core/services/builder/ToolExecutorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import com.google.common.collect.Lists;
1111

12-
public class ToolExecutorTests {
12+
public class ToolExecutorTest {
1313

1414
@Test
1515
public void test1() {

org.erlide.core.tests/src/org/erlide/engine/services/parsing/SimpleParserTests.java renamed to org.erlide.core.tests/src/org/erlide/engine/services/parsing/SimpleParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.ericsson.otp.erlang.OtpErlangObject;
1616
import com.google.common.collect.Lists;
1717

18-
public class SimpleParserTests {
18+
public class SimpleParserTest {
1919

2020
SimpleParserService parser;
2121

0 commit comments

Comments
 (0)