Automated merge with http://hg.netbeans.org/netigso
authorffjre@netbeans.org
Sun, 28 Jun 2009 03:42:53 +0400
changeset 92315ebda6eb52b
parent 922 32eafc9ea617
parent 797 964cf07b2516
child 924 fe3d6e386634
Automated merge with http://hg.netbeans.org/netigso
     1.1 --- a/openide.util/nbproject/org-openide-util.sig	Sat Jun 20 03:43:21 2009 +0400
     1.2 +++ b/openide.util/nbproject/org-openide-util.sig	Sun Jun 28 03:42:53 2009 +0400
     1.3 @@ -1,5 +1,5 @@
     1.4  #Signature file v4.0
     1.5 -#Version 7.18.1
     1.6 +#Version 7.22.1
     1.7  
     1.8  CLSS public java.awt.datatransfer.Clipboard
     1.9  cons public Clipboard(java.lang.String)
    1.10 @@ -576,7 +576,7 @@
    1.11  meth public static java.lang.String findLocalizedMessage(java.lang.Throwable)
    1.12  meth public static void printStackTrace(java.lang.Throwable)
    1.13  supr java.lang.Object
    1.14 -hfds LOC_MSG_PLACEHOLDER
    1.15 +hfds LOC_MSG_PLACEHOLDER,LOG
    1.16  hcls AnnException,OwnLevel
    1.17  
    1.18  CLSS public final org.openide.util.HelpCtx
    1.19 @@ -609,6 +609,7 @@
    1.20  meth public final static java.awt.Image mergeImages(java.awt.Image,java.awt.Image,int,int)
    1.21  meth public final static java.lang.String getImageToolTip(java.awt.Image)
    1.22  meth public final static javax.swing.Icon image2Icon(java.awt.Image)
    1.23 +meth public final static javax.swing.ImageIcon loadImageIcon(java.lang.String,boolean)
    1.24  supr java.lang.Object
    1.25  hfds ERR,NO_ICON,PNG_READER,TOOLTIP_SEPAR,cache,component,compositeCache,currentLoader,extraInitialSlashes,imageToolTipCache,loaderQuery,localizedCache,mediaTrackerID,noLoaderWarned,tracker
    1.26  hcls ActiveRef,CompositeImageKey,ToolTipImage,ToolTipImageKey
    1.27 @@ -770,7 +771,7 @@
    1.28  meth public static void setClassLoaderFinder(org.openide.util.NbBundle$ClassLoaderFinder)
    1.29   anno 0 java.lang.Deprecated()
    1.30  supr java.lang.Object
    1.31 -hfds USE_DEBUG_LOADER,brandingToken,bundleCache,localizedFileCache
    1.32 +hfds LOG,USE_DEBUG_LOADER,brandingToken,bundleCache,localizedFileCache
    1.33  hcls AttributesMap,DebugLoader,LocaleIterator,MergedBundle,PBundle
    1.34  
    1.35  CLSS public abstract interface static org.openide.util.NbBundle$ClassLoaderFinder
    1.36 @@ -1021,6 +1022,7 @@
    1.37  meth public static java.lang.String getClassName(java.lang.Class)
    1.38  meth public static java.lang.String getShortClassName(java.lang.Class)
    1.39  meth public static java.lang.String keyToString(javax.swing.KeyStroke)
    1.40 +meth public static java.lang.String keyToString(javax.swing.KeyStroke,boolean)
    1.41  meth public static java.lang.String replaceString(java.lang.String,java.lang.String,java.lang.String)
    1.42  meth public static java.lang.String translate(java.lang.String)
    1.43  meth public static java.lang.String wrapString(java.lang.String,int,boolean,boolean)
    1.44 @@ -1042,8 +1044,8 @@
    1.45  meth public static javax.swing.KeyStroke[] stringToKeys(java.lang.String)
    1.46  meth public static org.openide.util.Lookup actionsGlobalContext()
    1.47  supr java.lang.Object
    1.48 -hfds ALT_WILDCARD_MASK,CTRL_WILDCARD_MASK,LOG,TRANS_LOCK,TYPICAL_MACOSX_MENU_HEIGHT,activeReferenceQueue,clearIntrospector,doClear,global,keywords,namesAndValues,operatingSystem,transExp,transLoader
    1.49 -hcls ActiveQueue,NamesAndValues,RE
    1.50 +hfds ALT_WILDCARD_MASK,CTRL_WILDCARD_MASK,LOG,TRANS_LOCK,TYPICAL_MACOSX_MENU_HEIGHT,clearIntrospector,doClear,global,keywords,namesAndValues,operatingSystem,transExp,transLoader
    1.51 +hcls NamesAndValues,RE
    1.52  
    1.53  CLSS public static org.openide.util.Utilities$UnorderableException
    1.54   anno 0 java.lang.Deprecated()
    1.55 @@ -1373,7 +1375,7 @@
    1.56  meth public java.lang.String toString()
    1.57  supr org.openide.util.Lookup
    1.58  hfds count,serialVersionUID,tree,treeLock
    1.59 -hcls ISE,Info,R,ReferenceIterator,ReferenceToResult,Storage
    1.60 +hcls CycleError,ISE,Info,NotifyListeners,R,ReferenceIterator,ReferenceToResult,Storage
    1.61  
    1.62  CLSS public static org.openide.util.lookup.AbstractLookup$Content
    1.63  cons public Content()
    1.64 @@ -1439,6 +1441,21 @@
    1.65  hfds data
    1.66  hcls EmptyInternalData,ImmutableInternalData,R,RealInternalData,SingleInternalData,WeakRef,WeakResult
    1.67  
    1.68 +CLSS public abstract interface !annotation org.openide.util.lookup.ServiceProvider
    1.69 + anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
    1.70 + anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
    1.71 +intf java.lang.annotation.Annotation
    1.72 +meth public abstract !hasdefault int position()
    1.73 +meth public abstract !hasdefault java.lang.String path()
    1.74 +meth public abstract !hasdefault java.lang.String[] supersedes()
    1.75 +meth public abstract java.lang.Class<?> service()
    1.76 +
    1.77 +CLSS public abstract interface !annotation org.openide.util.lookup.ServiceProviders
    1.78 + anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
    1.79 + anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
    1.80 +intf java.lang.annotation.Annotation
    1.81 +meth public abstract org.openide.util.lookup.ServiceProvider[] value()
    1.82 +
    1.83  CLSS public abstract org.openide.xml.EntityCatalog
    1.84  cons public EntityCatalog()
    1.85  fld public final static java.lang.String PUBLIC_ID = "-//NetBeans//Entity Mapping Registration 1.0//EN"