Not part of build. Dividing type ahead find into sub directories src resources public

git-svn-id: svn://10.0.0.236/trunk@127420 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/typeaheadfind/Makefile.in

@@ -31,59 +31,10 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = typeaheadfind
-LIBRARY_NAME = typeaheadfind
-ifneq ($(OS_ARCH),WINNT)
-SHORT_LIBNAME = typahead
-endif
+DIRS		= public src resources
 
-REQUIRES        = appcomps \
-		  embedcomponents \
-		  content \
-		  docshell \
-		  dom \
-		  find \
-		  intl \
-		  gfx \
-		  layout \
-		  locale \
-		  mozcomps \
-		  necko \
-		  pref \
-		  string \
-		  unicharutil \
-		  uriloader \
-		  view \
-		  webBrowser_core \
-		  webshell \
-		  widget \
-		  webbrwsr \
-		  windowwatcher \
-		  xpcom \
-		  $(NULL)
-
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME	= nsTypeAheadFind
-
-XPIDLSRCS= ./nsITypeAheadFind.idl \
-  $(NULL)
-
-CPPSRCS =   \
-  nsTypeAheadFind.cpp	   \
-  nsTypeAheadFindRegistration.cpp \
-  $(NULL)
-
-EXTRA_DSO_LIBS = \
-    gkgfx \
-    $(NULL)
-
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_UNICHARUTIL_LIBS)  \
-		$(EXTRA_DSO_LIBS)        \
-		$(MOZ_COMPONENT_LIBS)
-
-JARFILES = bin/components/libtypeaheadfind.so bin/components/typeaheadfind.xpt bin/chrome/typeaheadfind.jar bin/defaults/pref/typeaheadfind.js
+JARFILES = bin/components/libtypeaheadfind.so bin/components/typeaheadfind.xpt bin/chrome/typeaheadfind.jar \
+           bin/defaults/pref/typeaheadfind.js
 
 include $(topsrcdir)/config/rules.mk
 
@@ -91,7 +42,8 @@ libs::
 	$(INSTALL) $(srcdir)/resources/content/prefs/typeaheadfind.js $(DIST)/bin/defaults/pref
 
 install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/prefs/typeaheadfind.js $(DESTDIR)$(mozappdir)/defaults/pref
+	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/prefs/typeaheadfind.js \
+        $(DESTDIR)$(mozappdir)/defaults/pref
 
 # Temporary hack to make it easy to make a .xpi.
 # Bug 22062 discusses longer term options.

mozilla/extensions/typeaheadfind/public/Makefile.in

@@ -0,0 +1,41 @@
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (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.mozilla.org/MPL/
+
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+
+# The Initial Developer of the Original Code is Aaron Leventhal.
+# Portions created by Aaron Leventhal are Copyright (C) 2001
+# Aaron Leventhal. All Rights Reserved.
+
+# Alternatively, the contents of this file may be used under the terms
+# of the GNU General Public License (the "GPL"), in which case the
+# provisions of the GPL are applicable instead of those above.  If you
+# wish to allow use of your version of this file only under the terms of
+# the GPL and not to allow others to use your version of this file under
+# the MPL, indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by the
+# GPL. If you do not delete the provisions above, a recipient may use
+# your version of this file under either the MPL or the GPL.
+
+# Contributor(s):
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE=inspector
+XPIDL_MODULE=inspector
+
+XPIDLSRCS= ./nsITypeAheadFind.idl \
+  $(NULL)
+
+
+include $(topsrcdir)/config/rules.mk

mozilla/extensions/typeaheadfind/resources/Makefile.in

@@ -0,0 +1,34 @@
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (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.mozilla.org/MPL/
+
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+
+# The Initial Developer of the Original Code is Aaron Leventhal.
+# Portions created by Aaron Leventhal are Copyright (C) 2001
+# Aaron Leventhal. All Rights Reserved.
+
+# Alternatively, the contents of this file may be used under the terms
+# of the GNU General Public License (the "GPL"), in which case the
+# provisions of the GPL are applicable instead of those above.  If you
+# wish to allow use of your version of this file only under the terms of
+# the GPL and not to allow others to use your version of this file under
+# the MPL, indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by the
+# GPL. If you do not delete the provisions above, a recipient may use
+# your version of this file under either the MPL or the GPL.
+
+# Contributor(s):
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk

mozilla/extensions/typeaheadfind/resources/jar.mn

@@ -1,4 +1,4 @@
 typeaheadfind.jar:
-    locale/en-US/typeaheadfind/contents.rdf                               (resources/locale/en-US/contents.rdf)
-    locale/en-US/typeaheadfind/typeaheadfind.properties                   (resources/locale/en-US/typeaheadfind.properties)
+    locale/en-US/typeaheadfind/contents.rdf                               (locale/en-US/contents.rdf)
+    locale/en-US/typeaheadfind/typeaheadfind.properties                   (locale/en-US/typeaheadfind.properties)
 

mozilla/extensions/typeaheadfind/src/Makefile.in

@@ -0,0 +1,84 @@
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (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.mozilla.org/MPL/
+
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+
+# The Initial Developer of the Original Code is Aaron Leventhal.
+# Portions created by Aaron Leventhal are Copyright (C) 2001
+# Aaron Leventhal. All Rights Reserved.
+
+# Alternatively, the contents of this file may be used under the terms
+# of the GNU General Public License (the "GPL"), in which case the
+# provisions of the GPL are applicable instead of those above.  If you
+# wish to allow use of your version of this file only under the terms of
+# the GPL and not to allow others to use your version of this file under
+# the MPL, indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by the
+# GPL. If you do not delete the provisions above, a recipient may use
+# your version of this file under either the MPL or the GPL.
+
+# Contributor(s):
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = typeaheadfind
+LIBRARY_NAME = typeaheadfind
+ifneq ($(OS_ARCH),WINNT)
+SHORT_LIBNAME = typahead
+endif
+
+REQUIRES        = appcomps \
+		  embedcomponents \
+		  content \
+		  docshell \
+		  dom \
+		  find \
+		  intl \
+		  gfx \
+		  layout \
+		  locale \
+		  mozcomps \
+		  necko \
+		  pref \
+		  string \
+		  unicharutil \
+		  uriloader \
+		  view \
+		  webBrowser_core \
+		  webshell \
+		  widget \
+		  webbrwsr \
+		  windowwatcher \
+		  xpcom \
+		  $(NULL)
+
+EXPORT_LIBRARY = 1
+IS_COMPONENT = 1
+MODULE_NAME	= nsTypeAheadFind
+
+CPPSRCS =   \
+  nsTypeAheadFind.cpp	   \
+  nsTypeAheadFindRegistration.cpp \
+  $(NULL)
+
+EXTRA_DSO_LIBS = \
+    gkgfx \
+    $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+		$(MOZ_UNICHARUTIL_LIBS)  \
+		$(EXTRA_DSO_LIBS)        \
+		$(MOZ_COMPONENT_LIBS)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp

@@ -286,8 +286,7 @@ nsTypeAheadFind::PrefsReset(const char* aPrefName, void* instance_data)
       }
       else {
         progress->AddProgressListener(typeAheadFind,
-                                      nsIWebProgress::NOTIFY_STATE_DOCUMENT |
-                                      nsIWebProgress::NOTIFY_STATE_WINDOW);
+                                      nsIWebProgress::NOTIFY_STATE_DOCUMENT);
         // Initialize string bundle
         nsCOMPtr<nsIStringBundleService> stringBundleService =
           do_GetService(kStringBundleServiceCID);
@@ -554,11 +553,6 @@ nsTypeAheadFind::Blur(nsIDOMEvent* aEvent)
 NS_IMETHODIMP
 nsTypeAheadFind::HandleEvent(nsIDOMEvent* aEvent)
 {
-  nsAutoString eventName;
-  aEvent->GetType(eventName);
-  if (eventName.Equals(NS_LITERAL_STRING("DOMWindowDestroyed")))
-    printf("\nDOMWindowClose!");
-
   return NS_OK; 
 }
 
@@ -1804,6 +1798,7 @@ void
 nsTypeAheadFind::DisplayStatus(PRBool aSuccess, nsIContent *aFocusedContent, 
                                PRBool aClearStatus)
 {
+  // pres shell -> pres context -> container -> tree item -> tree owner -> browser chrome
   nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mFocusedWeakShell));
   if (!presShell)
     return;