Skip to content

Commit a60d33c

Browse files
committed
Upgraded the Tooling Support Bundle to version 1.0.4 and released plugin 1.0.3.4.
1 parent 63a3687 commit a60d33c

File tree

11 files changed

+158
-122
lines changed

11 files changed

+158
-122
lines changed

AEM IDE Tooling 4 IntelliJ.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<excludeFolder url="file://$MODULE_DIR$/eclipse.aem.tooling.generatedd.test.project" />
1212
<excludeFolder url="file://$MODULE_DIR$/src/main/java/com/headwire/aem/tooling/intellij/console/intellij" />
1313
</content>
14-
<orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-181.5540.7" jdkType="IDEA JDK" />
14+
<orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-182.4505.22" jdkType="IDEA JDK" />
1515
<orderEntry type="sourceFolder" forTests="false" />
1616
<orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault.rcp:3.1.38" level="project" />
1717
<orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.1.38" level="project" />

META-INF/plugin.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin version="2">
22
<id>com.headwire.aem.tooling.intellij</id>
33
<name>AEM IDE Tooling 4 IntelliJ</name>
4-
<version>1.0.3.4-beta2</version>
4+
<version>1.0.3.4</version>
55
<vendor email="aemintellijplugin@headwire.com" url="https://www.headwire.com/aemintellijplugin">headwire.com Inc</vendor>
66

77
<description><![CDATA[
@@ -16,16 +16,22 @@
1616

1717
<change-notes><![CDATA[
1818
<ul>
19-
<li>1.0.3.4-beta2:
19+
<li>1.0.3.4:
2020
<ol>
2121
<li>
2222
Added a fix of a threading issue inside the Import From action. IntelliJ does not permit (anymore)
2323
to write in an User Action.
2424
</li>
2525
<li>
2626
An exception during code change from the Code Smell Detector is ignored if it is based on
27-
the 'cannot run under write action' failure. There is not fix in sight from JetBrains or
27+
the 'cannot run under write action' failure. There is no fix in sight from JetBrains or
2828
help on how to make this work so for now it is just ignored.
29+
Created ticket with JetBrains:
30+
https://youtrack.jetbrains.com/issue/IDEA-195954
31+
</li>
32+
<li>
33+
Upgraded the Tooling Support Bundle to version 1.0.4.
34+
</li>
2935
</ol>
3036
</li>
3137
<li>1.0.3.3:

Readme.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ This plugin requires to run IntelliJ IDEA **2016.2** or higher.
66

77
#### Releases:
88

9-
Beta of 1.0.3.4 is out with a fix for the Import From action.
9+
1.0.3.4 is out with a fix for the 'Import From' action and ignoring
10+
an error from the Code Smell IntelliJ feature that I used to check
11+
code before building it. For IntelliJ 2018.2 this renders that feature
12+
mute.
1013

11-
Release of 1.0.3.3 is out. Check out in the release section.
12-
1314
**Attention**: due to changes inside IntelliJ APIs some stored data might be lost during
1415
the update. If your configuration is lost then just recreate it, if your modules are gone
1516
then just hit **verify** to rebuild them.
@@ -47,12 +48,13 @@ The **master** is the latest release code and it the same as the highest
4748

4849
#### Updates:
4950

50-
**1.0.3.4-beta2**:
51+
**1.0.3.4**:
5152
* A fix for the Import From User Action that fails because I cannot write from a
5253
User Action.
5354
* An exception during code change from the Code Smell Detector is ignored if it is based on
5455
the 'cannot run under write action' failure. There is not fix in sight from JetBrains or
5556
help on how to make this work so for now it is just ignored.
57+
* Upgraded the Tooling Support Bundle to version 1.0.4.
5658

5759
**1.0.3.3**:
5860
* Working on issues with latest IntelliJ Releases.

src/main/java/com/headwire/aem/tooling/intellij/action/AbstractProjectAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.intellij.openapi.actionSystem.AnActionEvent;
3232
import com.intellij.openapi.actionSystem.DataContext;
3333
import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
34+
import com.intellij.openapi.diagnostic.Logger;
3435
import com.intellij.openapi.progress.ProgressIndicator;
3536
import com.intellij.openapi.progress.ProgressManager;
3637
import com.intellij.openapi.progress.Task;
@@ -53,6 +54,8 @@ public abstract class AbstractProjectAction
5354
implements DumbAware
5455

5556
{
57+
final Logger LOG = Logger.getInstance(getClass());
58+
5659
/** Map that contains the Toolbar Locks per Project **/
5760
private static Map<Project, Boolean> lockMap = new HashMap<Project, Boolean>();
5861
private static ProgressHandlerImpl progressHandler;

src/main/java/com/headwire/aem/tooling/intellij/action/BuildConfigurationAction.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ protected void execute(@NotNull Project project, @NotNull DataContext dataContex
5050
ServerConfigurationManager configurationManager = ComponentProvider.getComponent(project, ServerConfigurationManager.class);
5151
if(selectionHandler != null && serverConnectionManager != null && configurationManager != null) {
5252
ServerConfiguration serverConfiguration = selectionHandler.getCurrentConfiguration();
53+
//AS TODO: 7/23/2018 For temporary debugging purposes
54+
LOG.debug("Server Configuration for Build Dialog: " + serverConfiguration);
5355
BuildSelectionDialog dialog = new BuildSelectionDialog(project, serverConfiguration);
5456
if(dialog.showAndGet()) {
5557
// Modules might have changed and so update the tree
5658
configurationManager.updateServerConfiguration(serverConfiguration);
5759
}
5860
}
61+
//AS TODO: 7/23/2018 For temporary debugging purposes
62+
else { LOG.debug("Selection / Server Connection or Configuration Manager is null -> ignored: " + selectionHandler + ", " + serverConnectionManager + ", " + configurationManager); }
5963
}
6064

6165
@Override

0 commit comments

Comments
 (0)