You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2018/01/16 16:42:57 UTC
[sling-ide-tooling] branch master updated (22fe3f6 -> 3750fbf)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git.
from 22fe3f6 Update .gitignore patterns
new 2e01d9e SLING-7385 - Unable to import from repository - No valid filter found
new 3750fbf SLING-7385 - Unable to import from repository - No valid filter found
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../sling/ide/eclipse/ui/internal/ImportWizardPage.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-ide-tooling] 01/02: SLING-7385 - Unable to import from
repository - No valid filter found
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit 2e01d9e6daedd0348f3024fac74dfd64128e232a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jan 16 18:29:53 2018 +0200
SLING-7385 - Unable to import from repository - No valid filter found
Ensure that when the filter is found page completion status is updated.
Otherwise validation checks would miss the fact that the filter is
actually there.
---
.../apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java b/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
index 51aa758..6629534 100644
--- a/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
+++ b/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
@@ -61,7 +61,7 @@ public class ImportWizardPage extends WizardDataTransferPage {
private Label adjustJcrRootText;
private IFolder importRoot;
private Composite adjustComposite;
- boolean hasValidFilter;
+ private boolean hasValidFilter;
/**
* Creates an import wizard page for importing from a Sling Repository. If
@@ -308,7 +308,7 @@ public class ImportWizardPage extends WizardDataTransferPage {
@Override
protected void updateWidgetEnablements() {
super.updateWidgetEnablements();
-
+
boolean pageComplete = determinePageCompletion();
setPageComplete(pageComplete);
if (pageComplete) {
@@ -328,7 +328,10 @@ public class ImportWizardPage extends WizardDataTransferPage {
if (filterFile != null && filterFile.exists()) {
importLabel.setText("Will apply import filter from /" + filterFile.getProjectRelativePath() + ".");
- hasValidFilter = true;
+ if ( !hasValidFilter ) {
+ hasValidFilter = true;
+ determinePageCompletion();
+ }
}
importLabel.setVisible(true);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-ide-tooling] 02/02: SLING-7385 - Unable to import from
repository - No valid filter found
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit 3750fbff0e5935ef60295ac2fa78036363f54d2d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jan 16 18:42:51 2018 +0200
SLING-7385 - Unable to import from repository - No valid filter found
Really set the page completion status, not only toggle the widgets.
---
.../org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java b/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
index 6629534..bd313bb 100644
--- a/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
+++ b/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
@@ -322,7 +322,7 @@ public class ImportWizardPage extends WizardDataTransferPage {
adjustComposite.setVisible(project != null);
adjustComposite.getParent().layout();
-
+
if (importRoot != null) {
IFile filterFile = getFilter();
@@ -330,7 +330,7 @@ public class ImportWizardPage extends WizardDataTransferPage {
importLabel.setText("Will apply import filter from /" + filterFile.getProjectRelativePath() + ".");
if ( !hasValidFilter ) {
hasValidFilter = true;
- determinePageCompletion();
+ setPageComplete(determinePageCompletion());
}
}
importLabel.setVisible(true);
@@ -377,6 +377,7 @@ public class ImportWizardPage extends WizardDataTransferPage {
setErrorMessage(repositoryError);
return false;
}
+
return true;
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.