Author: rombert
Date: Thu Sep 26 21:46:27 2013
New Revision: 1526713
URL: http://svn.apache.org/r1526713
Log:
SLING-3064 - Disable content sync when importing content
Mark imported resources with a session property which prevents the next
update from being performed.
Added:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ResourceUtil.java
(with props)
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Added:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ResourceUtil.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ResourceUtil.java?rev=1526713&view=auto
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ResourceUtil.java
(added)
+++
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ResourceUtil.java
Thu Sep 26 21:46:27 2013
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.core;
+
+import org.apache.sling.ide.eclipse.core.internal.Activator;
+import org.eclipse.core.runtime.QualifiedName;
+
+public abstract class ResourceUtil {
+
+ public static final QualifiedName QN_IGNORE_NEXT_CHANGE = new
QualifiedName(Activator.PLUGIN_ID, "ignoreNextChange");
+
+ private ResourceUtil() {
+
+ }
+}
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ResourceUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ResourceUtil.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1526713&r1=1526712&r2=1526713&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Thu Sep 26 21:46:27 2013
@@ -40,6 +40,7 @@ import org.apache.sling.ide.artifacts.Em
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.apache.sling.ide.eclipse.core.MavenLaunchHelper;
import org.apache.sling.ide.eclipse.core.ProjectUtil;
+import org.apache.sling.ide.eclipse.core.ResourceUtil;
import org.apache.sling.ide.eclipse.core.ServerUtil;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterLocator;
@@ -522,6 +523,12 @@ public class SlingLaunchpadBehaviour ext
return null;
}
+ Object ignoreNextUpdate =
res.getSessionProperty(ResourceUtil.QN_IGNORE_NEXT_CHANGE);
+ if (ignoreNextUpdate != null) {
+ res.setSessionProperty(ResourceUtil.QN_IGNORE_NEXT_CHANGE, null);
+ return null;
+ }
+
if (res.isTeamPrivateMember(IResource.CHECK_ANCESTORS)) {
Activator.getDefault().getLog()
.log(new Status(IStatus.INFO, Activator.PLUGIN_ID,
"Skipping team-private resource " + res));
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java?rev=1526713&r1=1526712&r2=1526713&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Thu Sep 26 21:46:27 2013
@@ -27,6 +27,7 @@ import java.util.List;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.apache.sling.ide.eclipse.core.ProjectUtil;
+import org.apache.sling.ide.eclipse.core.ResourceUtil;
import org.apache.sling.ide.eclipse.core.ServerUtil;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterLocator;
@@ -281,6 +282,8 @@ public class ImportRepositoryContentActi
return;
destinationFolder.create(true, true, null /* TODO progress monitor */);
+
+
destinationFolder.setSessionProperty(ResourceUtil.QN_IGNORE_NEXT_CHANGE,
Boolean.TRUE.toString());
}
private void createFile(IProject project, IPath path, byte[] node) throws
CoreException {
@@ -299,6 +302,8 @@ public class ImportRepositoryContentActi
}
destinationFile.create(new ByteArrayInputStream(node), true,
null);
}
+
+ destinationFile.setSessionProperty(ResourceUtil.QN_IGNORE_NEXT_CHANGE,
Boolean.TRUE.toString());
}
private void createParents(IContainer container) throws CoreException {
