Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2012-09-21 02:06:49 -0400
committerRobin Stocker2013-02-12 15:34:51 -0500
commit64c50c5d3db240cb228307e7553d1059ba87c3c9 (patch)
treee01ef432615f73838017ddc86cb5c185c0db9e8d /org.eclipse.egit.ui/src
parente9d0ac6c074135eb9cc6a97dc373d458ec3e8d67 (diff)
downloadegit-64c50c5d3db240cb228307e7553d1059ba87c3c9.tar.gz
egit-64c50c5d3db240cb228307e7553d1059ba87c3c9.tar.xz
egit-64c50c5d3db240cb228307e7553d1059ba87c3c9.zip
Auto-ignore derived resources
Automatically ignore derived resources. Register a resource change listener to detect resources marked as derived asynchronously. Auto-ignore can be switched off using a new preference. Bug: 297674 Change-Id: I02d0e12e9bee94b1121a1fa57eedfc268dd8e5ef Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.egit.ui/src')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java5
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ProjectsPreferencePage.java4
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties3
3 files changed, 10 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
index ed3fcaf98..b20f5aeaf 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
@@ -1,7 +1,7 @@
/*******************************************************************************
* Copyright (C) 2008, Roger C. Soares <rogersoares@intelinet.com.br>
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
- * Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com>
+ * Copyright (C) 2010, 2013 Matthias Sohn <matthias.sohn@sap.com>
* Copyright (C) 2011, Daniel Megert <daniel_megert@ch.ibm.com>
* Copyright (C) 2012, Mathias Kinzler <mathias.kinzler@sap.com>
* Copyright (C) 2012, Daniel Megert <daniel_megert@ch.ibm.com>
@@ -642,6 +642,9 @@ public class UIText extends NLS {
public static String ProjectsPreferencePage_RestoreBranchProjects;
/** */
+ public static String ProjectsPreferencePage_AutoIgnoreDerivedResources;
+
+ /** */
public static String GitProjectPropertyPage_LabelBranch;
/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ProjectsPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ProjectsPreferencePage.java
index 770ea560d..11cd373b0 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ProjectsPreferencePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ProjectsPreferencePage.java
@@ -51,5 +51,9 @@ public class ProjectsPreferencePage extends FieldEditorPreferencePage implements
.getPreferenceStore();
}
});
+ addField(new BooleanFieldEditor(
+ GitCorePreferences.core_autoIgnoreDerivedResources,
+ UIText.ProjectsPreferencePage_AutoIgnoreDerivedResources,
+ getFieldEditorParent()));
}
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 88259e29d..6e825f59d 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2005, 2012 Shawn Pearce and others.
+# Copyright (c) 2005, 2013 Shawn Pearce and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -900,6 +900,7 @@ WindowCachePreferencePage_streamFileThreshold=Stream File Threshold:
ProjectsPreferencePage_AutoShareProjects=Auto share projects located in a git repository
ProjectsPreferencePage_RestoreBranchProjects=Track each branch's imported projects and restore on checkout
+ProjectsPreferencePage_AutoIgnoreDerivedResources=Automatically ignore derived resources by adding them to .gitignore
RefreshPreferencesPage_RefreshOnlyWhenActive=Refresh only when workbench is &active
RefreshPreferencesPage_RefreshWhenIndexChange=Refresh resources when &index changes

Back to the top