Datasets:
ducanger
/
diff-fira

Dataset card Data Studio Files
xet
Community
1
diff
stringlengths
38
1.78k
msg_token
stringlengths
9
190
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; - import static NAMESPACE ; + import static NAMESPACE ; + import static NAMESPACE ; + import static NAMESPACE ; COMMENT
Fix checkstyle issues
<nb> public final class JavaWriter implements Closeable { out . write ( STRING0 ) ; emitType ( extendsType ) ; } - if ( ( implementsTypes != null ) && ( implementsTypes . length > NUMBER0 ) ) { + if ( implementsTypes . length > NUMBER0 ) { out . write ( STRING1 ) ; indent ( ) ; out . write ( STRING2 ) ;
Remove an extra null check
<nb> public class EditPreferences extends TodorooPreferenceActivity { preference . setEnabled ( false ) ; preference . setSummary ( R . string . EPr_theme_desc_unsupported ) ; } else { - int index = NUMBER0 ; + int index = NUMBER1 ; if ( value != null ) index = AndroidUtilities . indexOf ( r . getStringArray ( R . array . EPr_theme_settings ) , ( String ) value ) ; preference . setSummary ( getString ( R . string . EPr_theme_desc ,
Fixed a bug where before a theme was selected it would say the red one was the default
<nb> public class JsonWriter { this . writer = writer ; } + @ suppresswarnings ( STRING0 ) public void write ( Object o ) { try {
Fix newly introduced warnings in JsonWriter
<nb> public class ReactRootView extends SizeMonitoringFrameLayout implements RootView if ( widthMode == MeasureSpec . UNSPECIFIED || heightMode == MeasureSpec . UNSPECIFIED ) { throw new IllegalStateException ( STRING0 + - STRING1 ) ; + STRING2 + + STRING3 + widthMode + STRING4 + heightMode ) ; } setMeasuredDimension (
Improve ReactRootView s onMeasure error message
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; + import NAMESPACE ; COMMENT COMMENT <nb> public class DiskCache < O extends Serializable > { public DiskAppender append ( O object ) { try { output . writeObject ( object ) ; + output . reset ( ) ; return this ; } catch ( IOException e ) { throw new IllegalStateException ( STRING0 + file , e ) ;
improve significantly memore consumption while using a disk cache
<nb> public class Templates { add ( Ops . MATCHES , STRING0 ) ; add ( Ops . STARTS_WITH , STRING1 ) ; add ( Ops . STARTS_WITH_IC , STRING2 ) ; - add ( Ops . ENDS_WITH , STRING3 ) ; + add ( Ops . ENDS_WITH , STRING4 ) ; add ( Ops . ENDS_WITH_IC , STRING5 ) ; add ( Ops . STRING_CONTAINS , STRING6 ) ; add ( Ops . STRING_CONTAINS_IC , STRING7 ) ;
fixed endsWith template
<nb> public class DiscreteSeekBar extends View { bounds . inset ( - mAddedTouchBounds , - mAddedTouchBounds ) ; mIsDragging = ( bounds . contains ( ( int ) ev . getX ( ) , ( int ) ev . getY ( ) ) ) ; if ( ! mIsDragging && mAllowTrackClick && ! ignoreTrackIfInScrollContainer ) { - if ( mPublicChangeListener != null ) { - mPublicChangeListener . onStartTrackingTouch ( this ) ; - } - SINGLE SINGLE mIsDragging = true ; <nb> public class DiscreteSeekBar extends View { attemptClaimDrag ( ) ; setHotspot ( ev . getX ( ) , ev . getY ( ) ) ; mDragOffset = ( int ) ( ev . getX ( ) - bounds . left - mAddedTouchBounds ) ; + if ( mPublicChangeListener != null ) { + mPublicChangeListener . onStartTrackingTouch ( this ) ; + } } return mIsDragging ; }
Fix onStartTrackingTouch listener call
<nb> public class ActivityCursorAdapter extends TimeLineCursorAdapter { @ override public void onClick ( View view ) { Intent viewProfile = new Intent ( context , ProfilePager . class ) ; - if ( screenname . contains ( STRING0 ) ) { + if ( screenname == null ) { + String [ ] userArray = users . split ( STRING0 ) ; + viewProfile . putExtra ( STRING1 , userArray [ NUMBER0 ] . replace ( STRING2 , STRING3 ) . replace ( STRING0 , STRING3 ) ) ; + } else if ( screenname . contains ( STRING0 ) ) { holder . background . performClick ( ) ; } else { viewProfile . putExtra ( STRING1 , screenname ) ;
Fix NPE on activity adapter
<nb> public class MethodDefinition { @ nonnull public final ImmutableList < Instruction > instructions ; public RegisterFormatter registerFormatter ; - @ nonnull private final String methodString ; - @ nonnull private final LabelCache labelCache = new LabelCache ( ) ; @ nonnull private final SparseIntArray packedSwitchMap ; <nb> public class MethodDefinition { this . method = method ; this . methodImpl = methodImpl ; - this . methodString = MethodUtil . buildFullMethodString ( classDef . classDef , method ) ; - try { SINGLE <nb> public class MethodDefinition { } } } catch ( Exception ex ) { + String methodString ; + try { + methodString = MethodUtil . buildFullMethodString ( classDef . classDef , method ) ; + } catch ( Exception ex2 ) { + throw ExceptionWithContext . withContext ( ex , STRING0 ) ; + } throw ExceptionWithContext . withContext ( ex , STRING1 , methodString ) ; } }
Don t precompute the full method string in MethodDefinition
<nb> abstract public class ModelBuilder < M extends Model < M , P , O > , P extends Model . Param final Frame [ ] cvTrain = new Frame [ N ] ; final Frame [ ] cvValid = new Frame [ N ] ; final String [ ] identifier = new String [ N ] ; - final String weightName = STRING0 ; + final String weightName = STRING1 ; + if ( train ( ) . find ( weightName ) != - NUMBER0 ) throw new H2OIllegalArgumentException ( STRING2 + weightName + STRING3 ) ; final Key < M > origDest = dest ( ) ; for ( int i = NUMBER1 ; i < N ; ++ i ) {
Fix NPE due to name collision of user given and internally created column called weights
<nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT
Fix documentation typo
<nb> public class StreamCharBuffer extends GroovyObjectSupport implements Writable , C public StreamCharBuffer encodeToBuffer ( Encoder encoder ) { StreamCharBuffer coded = new StreamCharBuffer ( Math . min ( Math . max ( totalChunkSize , chunkSize ) * NUMBER0 / NUMBER1 , maxChunkSize ) ) ; + coded . setNotifyParentBuffersEnabled ( false ) ; EncodedAppender codedWriter = coded . writer . getEncodedAppender ( ) ; try { encodeTo ( codedWriter , encoder ) ;
don t expect buffer returned from encodeAs method to be modified after appending to some buffer
<nb> public class TestBatchInsert assertEquals ( NUMBER0 , props . size ( ) ) ; assertEquals ( STRING0 , props . get ( STRING1 ) ) ; assertEquals ( STRING2 , props . get ( STRING3 ) ) ; + inserter . shutdown ( ) ; } @ test <nb> public class TestBatchInsert assertEquals ( NUMBER0 , props . size ( ) ) ; assertEquals ( STRING0 , props . get ( STRING1 ) ) ; assertEquals ( STRING2 , props . get ( STRING3 ) ) ; + inserter . shutdown ( ) ; } @ test <nb> public class TestBatchInsert assertFalse ( inserter . relationshipHasProperty ( relationship , key + STRING4 ) ) ; } + inserter . shutdown ( ) ; } @ test <nb> public class TestBatchInsert assertTrue ( inserter . relationshipHasProperty ( relationship , key ) ) ; } } - + inserter . shutdown ( ) ; } @ test
Fixed test forgot to shutdown the batch inserter
<nb> public class GELFHttpHandler extends SimpleChannelHandler { final HttpResponse response = new DefaultFullHttpResponse ( httpRequestVersion , status ) ; + response . setHeader ( HttpHeaders . Names . CONTENT_LENGTH , NUMBER0 ) ; + if ( keepAlive ) { response . setHeader ( HttpHeaders . Names . CONNECTION , HttpHeaders . Values . KEEP_ALIVE ) ; }
Set content length header
<nb> public class EnronMailMapper for ( int i = NUMBER0 ; i < recips . length ; i ++ ) { String recip = recips [ i ] . trim ( ) ; if ( recip . length ( ) > NUMBER0 ) { - context . write ( new MailPair ( from , to ) , new IntWritable ( NUMBER1 ) ) ; + context . write ( new MailPair ( from , recip ) , new IntWritable ( NUMBER1 ) ) ; } } } <nb> public class EnronMailReducer final Iterable < IntWritable > pValues , final Context pContext ) throws IOException , InterruptedException { - LOG . info ( STRING0 + pKey . toString ( ) ) ; int sum = NUMBER0 ; for ( final IntWritable value : pValues ) { sum += value . get ( ) ;
use correct var in output val clean up logging in example
<nb> public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR STRING0 , STRING1 , STRING2 , + STRING3 , STRING4 , STRING5 , STRING6 , <nb> public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR getString ( R . string . lang_hr ) + incompleteSuffix , getString ( R . string . lang_hsb ) + incompleteSuffix , getString ( R . string . lang_hu ) , + getString ( R . string . lang_is ) + incompleteSuffix , getString ( R . string . lang_it ) , getString ( R . string . lang_ja ) , getString ( R . string . lang_ka ) + incompleteSuffix ,
add Icelandic display language
<nb> public class UIUtil { private static final Color INACTIVE_HEADER_COLOR = Gray . _128 ; private static final Color BORDER_COLOR = Color . LIGHT_GRAY ; - public static final Color CONTRAST_BORDER_COLOR = new JBColor ( NUMBER0 , NUMBER1 ) ; + public static final Color CONTRAST_BORDER_COLOR = new JBColor ( new NotNullProducer < Color > ( ) { + final Color color = new JBColor ( NUMBER0 , NUMBER1 ) ; + @ notnull + @ override + public Color produce ( ) { + if ( SystemInfo . isMac && isUnderIntelliJLaF ( ) ) { + return Gray . xC9 ; + } + return color ; + } + } ) ; public static final Color SIDE_PANEL_BACKGROUND = new JBColor ( new Color ( NUMBER2 ) , new Color ( NUMBER3 ) ) ; public static final Color AQUA_SEPARATOR_FOREGROUND_COLOR = new JBColor ( Gray . _190 , Gray . x51 ) ;
Make UIUtil CONTRAST_BORDER_COLOR a function
<nb> package NAMESPACE ; public interface EncoderAware { public boolean isEncoderAware ( ) ; - public void setEncoder ( Encoder encoder ) ; public Encoder getEncoder ( ) ; } <nb> public class GroovyPageTagWriter extends FastStringWriter implements EncoderAwar setOut ( streamBuffer . getWriterForEncoder ( ) ) ; } - public void setEncoder ( Encoder encoder ) { - ( ( EncoderAware ) getOut ( ) ) . setEncoder ( encoder ) ; - } - public Encoder getEncoder ( ) { return ( ( EncoderAware ) getOut ( ) ) . getEncoder ( ) ; }
remove encoder setter from EncoderAware interface
<nb> public class ServiceCacheImpl < T > implements ServiceCache < T > , PathChildrenCacheLi synchronized ( this ) { + SINGLE + SINGLE + SINGLE + cache . start ( true ) ; for ( ChildData childData : cache . getCurrentData ( ) ) {
added a comment
<nb> public class AzureStorageServiceImpl extends AbstractLifecycleComponent < AzureSto int timeout = ( int ) azureStorageSettings . getTimeout ( ) . getMillis ( ) ; client . getDefaultRequestOptions ( ) . setTimeoutIntervalInMs ( timeout ) ; } catch ( ClassCastException e ) { - throw new IllegalArgumentException ( STRING0 + azureStorageSettings . getTimeout ( ) + STRING1 ) ; + throw new IllegalArgumentException ( STRING2 + azureStorageSettings . getTimeout ( ) + + STRING3 ) ; } return client ; }
Change exception message for wrong timeout in azure repository settings
<nb> + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT package NAMESPACE ; import NAMESPACE ;
Add license header
<nb> package NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class Satellite return params_ ; } - public native void focusMainWindow ( ) COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT COMMENT COMMENT ;
correctly re activate main window from satellite in desktop mode
<nb> public class TextEditingTargetWidget menu . addItem ( commands_ . reindent ( ) . createMenuItem ( false ) ) ; menu . addItem ( commands_ . reflowComment ( ) . createMenuItem ( false ) ) ; menu . addItem ( commands_ . commentUncomment ( ) . createMenuItem ( false ) ) ; + menu . addItem ( commands_ . alignAssignment ( ) . createMenuItem ( false ) ) ; codeTransform_ = new ToolbarButton ( STRING0 , icon , menu ) ; codeTransform_ . setTitle ( STRING1 ) ; }
add menu item for editing target widget
<nb> public class TileFiller extends TileBuildCraft implements IInventory , IPowerRece @ override public void readGuiData ( DataInputStream data , EntityPlayer player ) throws IOException { - IFillerPattern prev = currentPattern ; - currentPattern = FillerManager . registry . getPattern ( data . readUTF ( ) ) ; - if ( currentPattern == null ) - currentPattern = PatternFill . INSTANCE ; - if ( prev != currentPattern ) - done = false ; - sendNetworkUpdate ( ) ; + setPattern ( FillerManager . registry . getPattern ( data . readUTF ( ) ) ) ; } }
Fix derpy Filler Pattern selection
<nb> public class ColumnExtractingLineExpression extends LineCollectorExpression < Obje @ override public Object value ( ) { Object value = context . get ( columnIdent ) ; - if ( ! columnIdent . equals ( DocSysColumns . RAW ) && value != null && value instanceof String ) { + if ( ! columnIdent . equals ( DocSysColumns . RAW ) && value instanceof String ) { return new BytesRef ( ( String ) value ) ; } return value ;
remove unnecessary npe check
<nb> public class IQRosterHandler extends IQHandler implements ServerFeaturesProvider catch ( UserNotFoundException e ) { } } - else { SINGLE - - Packet removePacket = createRemoveForward ( sender , recipient ) ; - router . route ( removePacket ) ; + else { + SINGLE + String serverDomain = localServer . getServerInfo ( ) . getName ( ) ; + SINGLE + if ( ! recipient . getDomain ( ) . contains ( serverDomain ) ) { + SINGLE + } + else { + Packet removePacket = createRemoveForward ( sender , recipient ) ; + router . route ( removePacket ) ; + } } }
Fixed exception when removing a roster item whose JID belongs to a foreign server
<nb> public class GremlinPipeline < S , E > implements Pipe < S , E > , MetaPipe { for ( final Pipe subPipe : metaPipe . getPipes ( ) ) { if ( subPipe instanceof AsPipe ) { asPipes . add ( ( AsPipe ) subPipe ) ; - } else if ( subPipe instanceof MetaPipe ) { + } + if ( subPipe instanceof MetaPipe ) { asPipes . addAll ( this . getAsPipes ( ( MetaPipe ) subPipe ) ) ; } }
fixed recurssion problem in GremlinPipeline getAsPipes
<nb> public class Roster { } COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + public boolean isSubscribedToMyPresence ( String jid ) { + RosterEntry entry = getEntry ( jid ) ; + if ( entry == null ) { + return false ; + } + switch ( entry . getType ( ) ) { + case from : + case both : + return true ; + default : + return false ; + } + } + + COMMENT COMMENT COMMENT COMMENT
Add Roster isSubscribedToMyPresence String
<nb> public class DRFTest extends TestUtil { parms . source = tfr ; parms . validation = test ; SINGLE - parms . ignored_cols_by_name = new int [ ] { NUMBER0 , NUMBER1 , NUMBER2 , NUMBER3 , NUMBER4 , NUMBER5 } ; + parms . ignored_cols_by_name = new int [ ] { NUMBER6 , NUMBER0 , NUMBER1 , NUMBER2 , NUMBER3 , NUMBER4 , NUMBER5 } ; parms . response = tfr . lastVec ( ) ; parms . nbins = NUMBER7 ; parms . ntrees = NUMBER0 ;
Ignore the first column as well just leave Dest around
<nb> COMMENT package NAMESPACE ; + import NAMESPACE ; + import NAMESPACE ; COMMENT <nb> public abstract class PsiRecursiveElementVisitor extends PsiElementVisitor { myRefExprsInVisit . pop ( ) ; } } + + public void visitJspFile ( JspFile file ) { + super . visitJspFile ( file ) ; + visitClass ( file . getJavaRoot ( ) ) ; + visitFile ( file . getBaseLanguageRoot ( ) ) ; + } }
file based inspections to work in jsp
<nb> public class DefaultPromise < V > extends AbstractFuture < V > implements Promise < V > { COMMENT COMMENT COMMENT - private Object listeners ; + private volatile Object listeners ; COMMENT COMMENT COMMENT <nb> public class DefaultPromise < V > extends AbstractFuture < V > implements Promise < V > { } private void notifyListeners ( ) { - SINGLE if ( listeners == null ) { return ; }
Fix improper synchronization in DefaultPromise
<nb> public abstract class JspContextManager { public abstract JspFile [ ] getSuitableContextFiles ( @ notnull PsiFile file ) ; - public abstract void setContextFile ( @ notnull PsiFile file , @ notnull JspFile contextFile ) ; + public abstract void setContextFile ( @ notnull PsiFile file , @ nullable JspFile contextFile , final boolean userDefined ) ; public abstract @ nullable JspFile getContextFile ( @ notnull PsiFile file ) ;
allow to set context file for jsp even if jsp isn t included in context file
<nb> public class AsyncHttpClient { } if ( contentType != null ) { - uriRequest . setHeader ( HEADER_CONTENT_TYPE , contentType ) ; + if ( uriRequest instanceof HttpEntityEnclosingRequestBase && ( ( HttpEntityEnclosingRequestBase ) uriRequest ) . getEntity ( ) != null ) { + Log . w ( LOG_TAG , STRING0 ) ; + } else { + uriRequest . setHeader ( HEADER_CONTENT_TYPE , contentType ) ; + } } responseHandler . setRequestHeaders ( uriRequest . getAllHeaders ( ) ) ;
Not setting Content Type if HttpEntity was set as it breaks eg
<nb> public interface OtrConstants { public static final String QueryMessage_V12 = STRING0 ; public static final String QueryMessage_V14x = STRING1 ; public static final String QueryMessage_V124x = STRING2 ; - public static final String QueryMessage_CommonRequest = STRING3 ; + public static final String QueryMessage_CommonRequest = STRING4 ; public static final String PlainText_V12 = STRING5 ; public static final String PlainText_V1 = STRING6 ; public static final String CommonRequest = STRING7 ;
show ChatSecure in the otr plaintext message
<nb> public class ServletOutputStreamImpl extends ServletOutputStream implements Buff this . written += len ; if ( contentLength != - NUMBER0 && this . written >= contentLength ) { state |= FLAG_CLOSED ; - if ( flushBufferAsync ( ) ) { + SINGLE + SINGLE + if ( buffersToWrite == null ) { channel . shutdownWrites ( ) ; state |= FLAG_DELEGATE_SHUTDOWN ; if ( ! channel . flush ( ) ) { <nb> public class ServletOutputStreamImpl extends ServletOutputStream implements Buff ByteBuffer [ ] bufs = buffersToWrite ; if ( bufs == null ) { - ByteBuffer buffer = buffer ( ) ; + ByteBuffer buffer = this . buffer ; + if ( buffer == null || buffer . position ( ) == NUMBER1 ) { + return true ; + } buffer . flip ( ) ; bufs = new ByteBuffer [ ] { buffer } ; }
Fix up issue with ServletOutputStream
<nb> class BitmapHunter implements Runnable { return result ; } - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT private static boolean shouldResize ( boolean onlyScaleDown , int inWidth , int inHeight , - int targetWidth , int targetHeight ) { - return ! onlyScaleDown || ( onlyScaleDown - && ( inWidth > targetWidth || inHeight > targetHeight ) ) ; + int targetWidth , int targetHeight ) { + return ! onlyScaleDown || ( ( inWidth > targetWidth || inHeight > targetHeight ) ) ; } }
Simplify if condition and remove internal javadoc
<nb> public class LdapActivator implements BundleActivator COMMENT COMMENT COMMENT - public void start ( BundleContext bundleContext ) throws Exception + public void start ( BundleContext bundleContext ) + throws Exception { LdapActivator . bundleContext = bundleContext ; <nb> public class LdapActivator implements BundleActivator COMMENT COMMENT COMMENT - public void stop ( BundleContext bundleContext ) throws Exception + public void stop ( BundleContext bundleContext ) + throws Exception { for ( Map . Entry < LdapContactSourceService , ServiceRegistration > entry : cssList . entrySet ( ) ) <nb> + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT package NAMESPACE ; import NAMESPACE ;
Adding license and code formatting
<nb> public class Ctags { do { String tagLine = ctagsOut . readLine ( ) ; SINGLE + if ( tagLine . length ( ) == NUMBER0 ) { + SINGLE + return ; + } int p = tagLine . indexOf ( STRING0 ) ; if ( p <= NUMBER0 ) { - SINGLE - return ; + SINGLE + continue ; } String def = tagLine . substring ( NUMBER0 , p ) ; int mstart = tagLine . indexOf ( STRING0 , p + NUMBER1 ) ; <nb> public class Ctags { match = match . replaceAll ( STRING1 , STRING2 ) ; match = match . replaceAll ( STRING3 , STRING4 ) ; } else { - SINGLE - return ; + SINGLE + continue ; } HashMap < Integer , String > taglist = defs . get ( def ) ; if ( taglist == null ) {
changed readTags to read until empty line skipping line with unexpected format
<nb> public abstract class NettyTransport implements Transport { private static final Logger log = LoggerFactory . getLogger ( NettyTransport . class ) ; - public static final int DEFAULT_RECV_BUFFER_SIZE = NUMBER0 * NUMBER0 ; protected final MetricRegistry localRegistry ; private final InetSocketAddress socketAddress ;
remove unused constant
<nb> public class AddTask extends SherlockActivity { } int currentLine = getCurrentCursorLine ( textInputField ) ; if ( currentLine != - NUMBER0 ) { + SINGLE + SINGLE + SINGLE + SINGLE + if ( lines . size ( ) == NUMBER0 ) { + currentLine = NUMBER1 ; + } Task t = new Task ( NUMBER1 , lines . get ( currentLine ) ) ; t . setPriority ( Priority . toPriority ( newPrio . toString ( ) ) ) ; lines . set ( currentLine , t . inFileFormat ( ) ) ;
Avoid java lang IndexOutOfBoundsException while prioritizing tasks
<nb> public class DeployToServerRunConfiguration < S extends ServerConfiguration , D ext throw new WriteExternalException ( STRING0 + myDeploymentSource ) ; } if ( myDeploymentConfiguration != null ) { - itemState . setSettings ( XmlSerializer . serialize ( myDeploymentConfiguration . getSerializer ( ) . getState ( ) , SERIALIZATION_FILTERS ) ) ; + Object configurationState = myDeploymentConfiguration . getSerializer ( ) . getState ( ) ; + if ( configurationState != null ) { + itemState . setSettings ( XmlSerializer . serialize ( configurationState , SERIALIZATION_FILTERS ) ) ; + } } state . myDeploymentItemState . add ( itemState ) ; }
fixed persisting deploy run configuration
<nb> public class XmppConnectionService extends Service implements OnPhoneContactsLoa } } for ( final Message msg : messages ) { + msg . setTime ( System . currentTimeMillis ( ) ) ; markMessage ( msg , Message . STATUS_WAITING ) ; - this . resendMessage ( msg , true ) ; + this . resendMessage ( msg , false ) ; } }
set time on resend to current time
<nb> public class SwingHelper { textPane . setContentType ( UIUtil . HTML_MIME ) ; textPane . setEditable ( false ) ; if ( background != null ) { - textPane . setBackground ( background ) ; SINGLE + textPane . setBackground ( background ) ; } else { textPane . setOpaque ( false ) ; - if ( UIUtil . isUnderNimbusLookAndFeel ( ) ) { - textPane . setBackground ( UIUtil . TRANSPARENT_COLOR ) ; - } } textPane . setForeground ( foreground != null ? foreground : UIUtil . getLabelForeground ( ) ) ; return textPane ;
don t check deprecated Nimbus L F
<nb> COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> package NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; - class VisibilityAwareImageButton extends AppCompatImageButton { + class VisibilityAwareImageButton extends ImageButton { private int mUserSetVisibility ;
Fix crash in FAB background tint
<nb> public class ManifestUpdateMojo extends AbstractAndroidMojo COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT COMMENT + COMMENT + COMMENT + COMMENT + COMMENT COMMENT COMMENT COMMENT
Modified the documentation for the verion code generation property
<nb> public class LogBufferDescriptor COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> public class LogInspector final UnsafeBuffer logMetaDataBuffer = atomicBuffers [ LOG_META_DATA_SECTION_INDEX ] ; + out . format ( STRING0 , new Date ( timeOfLastStatusMessage ( logMetaDataBuffer ) ) ) ; out . format ( STRING1 , initialTermId ( logMetaDataBuffer ) ) ; out . format ( STRING2 , activePartitionIndex ( logMetaDataBuffer ) ) ; out . format ( STRING3 , termLength ) ;
Java Add time of last SM to LogInspector
<nb> package NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ;
Addressing a review comment
<nb> public class ShadowWrangler implements ClassHandler { throw new NullPointerException ( STRING0 ) ; } return method ( AsmInstrumentingClassLoader . GET_ROBO_DATA_METHOD_NAME ) . withReturnType ( Object . class ) . in ( instance ) . invoke ( ) ; - SINGLE - SINGLE - SINGLE - SINGLE - SINGLE - SINGLE - SINGLE } private void writeField ( Object target , Object value , Field realObjectField ) { <nb> public class ShadowWrangler implements ClassHandler { SINGLE Object shadow = roboData ; try { - SINGLE return shadowMethod . invoke ( shadow , params ) ; } catch ( IllegalArgumentException e ) { throw new IllegalArgumentException ( STRING1 + shadowMethod
Remove commented out code
<nb> package NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; + import NAMESPACE ; + import NAMESPACE ; + COMMENT COMMENT COMMENT <nb> public class Form { if ( ! FormField . TYPE_JID_MULTI . equals ( field . getType ( ) ) && ! FormField . TYPE_LIST_MULTI . equals ( field . getType ( ) ) && ! FormField . TYPE_LIST_SINGLE . equals ( field . getType ( ) ) + && ! FormField . TYPE_TEXT_MULTI . equals ( field . getType ( ) ) && ! FormField . TYPE_HIDDEN . equals ( field . getType ( ) ) ) { throw new IllegalArgumentException ( STRING0 ) ; }
Added check for missing field type for multi list in data forms
<nb> public class ErrorCheckerService implements Runnable { protected void updateSketchCodeListeners ( ) { for ( final SketchCode sc : editor . getSketch ( ) . getCode ( ) ) { boolean flag = false ; + if ( sc . getDocument ( ) == null + || ( ( SyntaxDocument ) sc . getDocument ( ) ) . getDocumentListeners ( ) == null ) + continue ; for ( DocumentListener dl : ( ( SyntaxDocument ) sc . getDocument ( ) ) . getDocumentListeners ( ) ) { if ( dl . equals ( sketchChangedListener ) ) { flag = true ;
avoid NPE while running Tweak
<nb> public class ManagerServlet addServiced ( path ) ; try { if ( config != null ) { + configBase . mkdirs ( ) ; copy ( new File ( config ) , new File ( configBase , getConfigFile ( path ) + STRING0 ) ) ; }
create configBase since it is no longer created elsewhere
<nb> public abstract class ScriptingIndexableSetContributor extends IndexableSetContr LibraryTable libTable = ScriptingLibraryManager . getLibraryTable ( project , ScriptingLibraryManager . LibraryLevel . GLOBAL ) ; if ( libTable != null ) { for ( Library lib : libTable . getLibraries ( ) ) { - if ( lib instanceof LibraryEx && ( ( LibraryEx ) lib ) . getType ( ) . equals ( libType ) ) { + if ( lib instanceof LibraryEx && libType . equals ( ( ( LibraryEx ) lib ) . getType ( ) ) ) { for ( VirtualFile libFile : lib . getFiles ( OrderRootType . SOURCES ) ) { libFile . putUserData ( getIndexKey ( ) , STRING0 ) ; libFiles . add ( libFile ) ;
fix NPE most libraries do not have type
<nb> public final class CameraManager { USE_CALLING_UID , holder ) ; cameraUser = ICameraDeviceUser . Stub . asInterface ( holder . getBinder ( ) ) ; } catch ( CameraRuntimeException e ) { - if ( e . getReason ( ) == CameraAccessException . CAMERA_DEPRECATED_HAL ) { - SINGLE - Log . i ( TAG , STRING0 ) ; - cameraUser = CameraDeviceUserShim . connectBinderShim ( callbacks , id ) ; - } else if ( e . getReason ( ) == CameraAccessException . CAMERA_IN_USE || + if ( e . getReason ( ) == CameraAccessException . CAMERA_IN_USE || e . getReason ( ) == CameraAccessException . MAX_CAMERAS_IN_USE || e . getReason ( ) == CameraAccessException . CAMERA_DISABLED || e . getReason ( ) == CameraAccessException . CAMERA_DISCONNECTED ||
Disallow shim usage for preview
<nb> public class CloudSetupFragment extends SherlockFragment { } SINGLE - mTextViewDescription . setText ( R . string . hexagon_signed_in ) ; + mTextViewDescription . setText ( R . string . hexagon_setup_incomplete ) ; mButtonAction . setText ( R . string . hexagon_setup_complete ) ; mButtonAction . setOnClickListener ( new View . OnClickListener ( ) { @ override
Display correct incomplete setup text
<nb> public class Mongo { COMMENT COMMENT @ deprecated - public static final int MINOR_VERSION = NUMBER0 ; + public static final int MINOR_VERSION = NUMBER1 ; - private static final String FULL_VERSION = STRING0 ; + private static final String FULL_VERSION = STRING1 ; static int cleanerIntervalMS ; static {
Updated Mongo java statics to new version
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class GwtTestWrapper extends GdxTest { public GdxTest instance ( ) { return new TiledMapAtlasAssetManagerTest ( ) ; } + } , new Instancer ( ) { + public GdxTest instance ( ) { + return new TimeUtilsTest ( ) ; + } } } ; @ override
add TimeUtils test instance to GWT
<nb> COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> public class NamedArgumentDescriptor { UNLIKELY } - private static class StringTypeConditionWithPriority extends StringTypeCondition { + public static class StringTypeConditionWithPriority extends StringTypeCondition { private final StringTypeConditionWithPriority [ ] myInstances ; - public StringTypeConditionWithPriority ( String typeName ) { + private StringTypeConditionWithPriority ( String typeName ) { this ( typeName , Priority . ALWAYS_ON_TOP , new StringTypeConditionWithPriority [ Priority . values ( ) . length ] ) ; }
g render Map named arguments completion
<nb> import NAMESPACE ; public class Gradient { private class ColorInterval { - public int color1 ; - public int color2 ; + private final int color1 ; + private final int color2 ; COMMENT COMMENT COMMENT COMMENT - public float duration ; + private final float duration ; public ColorInterval ( int color1 , int color2 , float duration ) { this . color1 = color1 ;
made things private final in colorInterval
<nb> public class ShardRecoveryManager } catch ( PrestoException e ) { stats . incrementShardRecoveryFailure ( ) ; + stagingFile . delete ( ) ; throw e ; } <nb> public class ShardRecoveryManager stats . incrementShardRecoveryFailure ( ) ; throw new PrestoException ( RAPTOR_RECOVERY_ERROR , STRING0 + shardUuid , e ) ; } + finally { + stagingFile . delete ( ) ; + } if ( ! storageFile . exists ( ) || ( shardSize . isPresent ( ) && ( storageFile . length ( ) != shardSize . getAsLong ( ) ) ) ) { stats . incrementShardRecoveryFailure ( ) ;
Delete staging file when shard recovery fails
<nb> public class OCommandExecutorScript extends OCommandExecutorAbstract implements try { Thread . sleep ( Integer . parseInt ( sleepTimeInMs ) ) ; } catch ( InterruptedException e ) { - OLogManager . instance ( ) . error ( this , STRING0 , e ) ; + OLogManager . instance ( ) . debug ( this , STRING1 ) ; } }
Changed log on script sleep
<nb> public class IpConfigStore { } } catch ( EOFException ignore ) { } catch ( IOException e ) { - loge ( STRING0 + e ) ; + loge ( STRING1 + e ) ; } finally { if ( in != null ) { try {
Fix a typo in IpConfigStore
<nb> COMMENT COMMENT COMMENT - COMMENT - COMMENT - COMMENT + COMMENT + COMMENT COMMENT COMMENT COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT + COMMENT + COMMENT + COMMENT + COMMENT COMMENT package NAMESPACE ; <nb> import NAMESPACE ; import NAMESPACE ; COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT + COMMENT + COMMENT COMMENT - COMMENT + COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> import NAMESPACE ; @ retention ( value = RetentionPolicy . RUNTIME ) @ documented @ gwtcompatible - public @ interface TesterAnnotation { - } + public @ interface TesterAnnotation { } <nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT - COMMENT - COMMENT + COMMENT + COMMENT + COMMENT + COMMENT COMMENT COMMENT COMMENT
Replace br tags
<nb> public class H2ONode extends Iced implements Comparable { SINGLE DTask dt = rpc . _dt ; SINGLE if ( dt != null && RPC . RPCCall . CAS_DT . compareAndSet ( rpc , dt , null ) ) { - assert rpc . _computed : STRING0 + task + STRING1 + rpc . _dt . getClass ( ) + STRING2 + rpc . _client ; + assert rpc . _computed : STRING0 + task + STRING1 + dt . getClass ( ) + STRING2 + rpc . _client ; AckAckTimeOutThread . PENDING . remove ( rpc ) ; dt . onAckAck ( ) ; SINGLE }
Fix possible NPE should only trigger if assert is triggering
<nb> COMMENT package NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class MainApp extends Application { } if ( BuildConfig . DEBUG ) { - String logpath = Environment . getExternalStorageDirectory ( ) + File . separator + STRING0 + File . separator + STRING1 ; + + String dataFolder = getDataFolder ( ) ; + + SINGLE + Log_OC . setLogDataFolder ( dataFolder ) ; + + Log_OC . startLogging ( ) ; Log_OC . d ( STRING2 , STRING3 ) ; - Log_OC . v ( STRING4 , logpath ) ; - Log_OC . startLogging ( logpath ) ; } }
Set the log folder path before starting logging
<nb> public class CoverageJavaRunConfigurationExtension extends RunConfigurationExten } @ override - public boolean isListenerDisabled ( RunConfigurationBase configuration , Object listener ) { + public boolean isListenerDisabled ( RunConfigurationBase configuration , Object listener , RunnerSettings runnerSettings ) { if ( listener instanceof CoverageListener ) { + if ( ! ( runnerSettings . getData ( ) instanceof CoverageRunnerData ) ) return true ; final CoverageEnabledConfiguration coverageEnabledConfiguration = CoverageEnabledConfiguration . getOrCreate ( configuration ) ; return ! ( coverageEnabledConfiguration . getCoverageRunner ( ) instanceof IDEACoverageRunner ) ; }
disable listeners when no coverage enabled
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class GCInspector SINGLE logger . info ( String . format ( STRING0 , STRING1 , STRING2 , CompactionManager . instance . getPendingTasks ( ) ) ) ; + int pendingCommands = NUMBER0 ; + for ( int n : MessagingService . instance . getCommandPendingTasks ( ) . values ( ) ) + { + pendingCommands += n ; + } + int pendingResponses = NUMBER0 ; + for ( int n : MessagingService . instance . getResponsePendingTasks ( ) . values ( ) ) + { + pendingResponses += n ; + } + logger . info ( String . format ( STRING0 , + STRING3 , STRING2 , pendingCommands + STRING4 + pendingResponses ) ) ; SINGLE logger . info ( String . format ( STRING5 , STRING6 , STRING7 , STRING8 , STRING9 ) ) ;
add MessagingService summary to GCInspector stats
<nb> public class ChangesBrowserNode < T > extends DefaultMutableTreeNode { } public int getSortWeight ( ) { - return NUMBER0 ; + return NUMBER1 ; } public int compareUserObjects ( final Object o2 ) { <nb> public class ChangesBrowserUnversionedFilesNode extends ChangesBrowserNode { public boolean isManyUnversioned ( ) { return myManyUnversioned ; } + + @ override + public int getSortWeight ( ) { + return NUMBER0 ; + } }
Display Unversioned Files node right after change list nodes
<nb> public final class Terasology { COMMENT COMMENT COMMENT - private void processKeyboardInput ( ) { + @ suppresswarnings ( STRING0 ) + private void processKeyboardInput ( ) { boolean debugEnabled = ( Boolean ) ConfigurationManager . getInstance ( ) . getConfig ( ) . get ( STRING1 ) ; while ( Keyboard . next ( ) ) { <nb> public class Player extends Character { } - @ override + @ suppresswarnings ( STRING0 ) + @ override public void writePropertiesToConfigObject ( ConfigObject co ) { co . put ( STRING2 , getPosition ( ) . x ) ; co . put ( STRING3 , getPosition ( ) . y ) ; <nb> public class LocalWorldProvider extends TeraObject implements IWorldProvider { return STRING4 ; } - @ override + @ suppresswarnings ( STRING0 ) + @ override public void writePropertiesToConfigObject ( ConfigObject co ) { co . put ( STRING5 , getTitle ( ) ) ; co . put ( STRING6 , getSeed ( ) ) ;
Suppress parameterization warnings where it looks like theres no alternative
<nb> public abstract class CameraMetadata { public static final int STATISTICS_FACE_DETECT_MODE_FULL = NUMBER0 ; SINGLE + SINGLE + SINGLE + + COMMENT + COMMENT + COMMENT + public static final int STATISTICS_LENS_SHADING_MAP_MODE_OFF = NUMBER1 ; + + COMMENT + COMMENT + COMMENT + public static final int STATISTICS_LENS_SHADING_MAP_MODE_ON = NUMBER2 ; + + SINGLE SINGLE SINGLE <nb> public final class CaptureRequest extends CameraMetadata implements Parcelable { COMMENT COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + public static final Key < Integer > STATISTICS_LENS_SHADING_MAP_MODE = + new Key < Integer > ( STRING0 , int . class ) ; + + COMMENT + COMMENT COMMENT COMMENT COMMENT
Add a missing key for controlling shading map mode
<nb> public class IndentingPrintWriter extends PrintWriter { mCurrent = mBuilder . toString ( ) ; } + public void printPair ( String key , Object value ) { + print ( key + STRING0 + String . valueOf ( value ) + STRING1 ) ; + } + @ override public void println ( ) { super . println ( ) ;
Add simple method to dump key value pairs
<nb> public class QueryStatistics implements org . neo4j . graphdb . QueryStatistics return inner . nodesCreated ( ) ; } + COMMENT + COMMENT + COMMENT + COMMENT @ override public int getNodesDeleted ( ) { <nb> public class QueryStatistics implements org . neo4j . graphdb . QueryStatistics return inner . relationshipsCreated ( ) ; } + COMMENT + COMMENT + COMMENT + COMMENT @ override public int getRelationshipsDeleted ( ) { <nb> public class QueryStatistics implements org . neo4j . graphdb . QueryStatistics } COMMENT - COMMENT - COMMENT - COMMENT - public int getDeletedNodes ( ) - { - return inner . nodesDeleted ( ) ; - } - - COMMENT - COMMENT - COMMENT - COMMENT - public int getDeletedRelationships ( ) - { - return inner . relationshipsDeleted ( ) ; - } - - COMMENT COMMENT COMMENT COMMENT
Remove unused code
<nb> import NAMESPACE ; COMMENT COMMENT COMMENT - public class DeviceFeaturesCollector { + final class DeviceFeaturesCollector { public static String getFeatures ( Context ctx ) { <nb> import NAMESPACE ; COMMENT COMMENT COMMENT - public class ReflectionCollector { + final class ReflectionCollector { COMMENT COMMENT <nb> import NAMESPACE ; COMMENT COMMENT COMMENT - public class SettingsCollector { + final class SettingsCollector { COMMENT COMMENT <nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - public class SharedPreferencesCollector { + final class SharedPreferencesCollector { public static String collect ( Context context ) { final StringBuilder result = new StringBuilder ( ) ;
Hiding classes that have no need to be visible outside of ACRA by making them package private
<nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT public class AntiEntropyService <nb> public class AntiEntropyService COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT private final ExpiringMap < String , Map < TreeRequest , TreePair > > requests ; <nb> public class AntiEntropyService COMMENT COMMENT - COMMENT + COMMENT COMMENT private Map < TreeRequest , TreePair > rendezvousPairs ( String sessionid ) { <nb> public class AntiEntropyService } COMMENT - COMMENT + COMMENT COMMENT private void rendezvous ( TreeRequest request , MerkleTree tree ) { <nb> public class AntiEntropyService } COMMENT - COMMENT + COMMENT COMMENT public void complete ( ) { <nb> public class AntiEntropyService } COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT
update comments to reflect new Stage ANTIENTROPY name
<nb> public class VoicemailContract { COMMENT COMMENT COMMENT - public static final String SOURCE_DATA = STRING0 ; + public static final String SOURCE_DATA = STRING1 ; COMMENT COMMENT COMMENT
Modified Voicemail SOURCE_DATA value to match with the constant name
<nb> public class WPRestClient { COMMENT COMMENT public void getStatsClicks ( String siteId , String date , Listener listener , ErrorListener errorListener ) { - String path = String . format ( STRING0 , siteId , date ) ; + String path = String . format ( STRING1 , siteId , date ) ; get ( path , listener , errorListener ) ; } <nb> public class WPRestClient { COMMENT COMMENT public void getStatsReferrers ( String siteId , String date , Listener listener , ErrorListener errorListener ) { - String path = String . format ( STRING2 , siteId , date ) ; + String path = String . format ( STRING3 , siteId , date ) ; get ( path , listener , errorListener ) ; }
FredrichO fixed rest call
<nb> public class CommentUserNoteBlock extends UserNoteBlock { noteBlockHolder . avatarImageView . setOnTouchListener ( null ) ; } } else { - noteBlockHolder . avatarImageView . setImageResource ( R . drawable . gravatar_placeholder ) ; + noteBlockHolder . avatarImageView . showDefaultGravatarImage ( ) ; noteBlockHolder . avatarImageView . setOnTouchListener ( null ) ; } <nb> public class UserNoteBlock extends NoteBlock { noteBlockHolder . rootView . setOnClickListener ( null ) ; } } else { - noteBlockHolder . avatarImageView . setImageResource ( R . drawable . gravatar_placeholder ) ; + noteBlockHolder . avatarImageView . showDefaultGravatarImage ( ) ; noteBlockHolder . avatarImageView . setOnTouchListener ( null ) ; }
Show rounded gravatar for CommentUserNoteBlock UserNoteBlock
<nb> public class OptionsAlertPanel extends AbstractParamPanel { @ override public String getHelpIndex ( ) { - return STRING0 ; + return STRING1 ; } }
Corrected alert options help index
<nb> class WatchServiceRegistrar implements FileWatcherListener { } private void watchDir ( Path dir ) throws IOException { - dir . register ( watchService , WATCH_KINDS , WATCH_MODIFIERS ) ; + try { + dir . register ( watchService , WATCH_KINDS , WATCH_MODIFIERS ) ; + } catch ( NoSuchFileException ignore ) { + SINGLE + } } private boolean inUnfilteredSubsetOrAncestorOfAnyRoot ( File file ) {
Allow directories under watch to be deleted before they are registered with the watch service
<nb> public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable , final Map < Key < ? extends BeforeRunTask > , BeforeRunTask > _tasks = new HashMap < Key < ? extends BeforeRunTask > , BeforeRunTask > ( ) ; for ( BeforeRunTaskProvider < ? extends BeforeRunTask > provider : Extensions . getExtensions ( BeforeRunTaskProvider . EXTENSION_POINT_NAME , myProject ) ) { - _tasks . put ( provider . getId ( ) , provider . createTask ( settings ) ) ; + BeforeRunTask task = provider . createTask ( settings ) ; + Key < ? extends BeforeRunTask > providerID = provider . getId ( ) ; + _tasks . put ( providerID , task ) ; + settings . getFactory ( ) . configureBeforeRunTaskDefaults ( providerID , task ) ; } return _tasks ; }
orerriding default before run task s settings in configuration type
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; COMMENT <nb> public abstract class BaseEntityRef extends EntityRef { public String toFullDescription ( ) { EntitySerializer serializer = new EntitySerializer ( ( EngineEntityManager ) entityManager ) ; serializer . setUsingFieldIds ( false ) ; - return EntityDataJSONFormat . write ( serializer . serialize ( this ) ) ; + return AccessController . doPrivileged ( ( PrivilegedAction < String > ) ( ) - > + EntityDataJSONFormat . write ( serializer . serialize ( this ) ) ) ; } }
Allow EntityRef toFullDescription to run in modules
<nb> package NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; + import NAMESPACE ; COMMENT COMMENT <nb> import NAMESPACE ; @ target ( { ElementType . TYPE , ElementType . METHOD } ) @ retention ( RetentionPolicy . RUNTIME ) @ scopeannotation + @ inherited public @ interface RequestScoped { }
Make this an inherited annotation
<nb> public class DefaultDependencyResolver implements ArtifactDependencyResolver { metaDataResolvers . add ( new ClientModuleResolver ( resolverProvider . getComponentResolver ( ) , dependencyDescriptorFactory ) ) ; LocalComponentFactoryChain localComponentFactory = new LocalComponentFactoryChain ( localComponentFactories ) ; - CompositeComponentMetaDataResolver metaDataResolver = new CompositeComponentMetaDataResolver ( metaDataResolvers ) ; + ComponentMetaDataResolverChain metaDataResolver = new ComponentMetaDataResolverChain ( metaDataResolvers ) ; DependencyToComponentIdResolverChain componentIdResolver = new DependencyToComponentIdResolverChain ( componentIdResolvers ) ; DependencyToComponentIdResolver idResolver = new DependencySubstitutionResolver ( componentIdResolver , resolutionStrategy . getDependencySubstitutionRule ( ) ) ;
Rename CompositeMetaDataResolver to ComponentMetaDataResolverChain for consistency
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - public class GraphServiceImplTest extends TestCase { + public class GraphServiceTest extends TestCase { File basePath ;
remove impl suffix
<nb> public class ActivityLauncher { } public static void addSelfHostedSiteForResult ( Activity activity ) { - Intent intent = new Intent ( activity , MagicLinkSignInActivity . class ) ; + Intent intent = new Intent ( activity , SignInActivity . class ) ; intent . putExtra ( SignInActivity . EXTRA_START_FRAGMENT , SignInActivity . ADD_SELF_HOSTED_BLOG ) ; activity . startActivityForResult ( intent , RequestCodes . ADD_ACCOUNT ) ; }
Reverting addSelfHostedSiteForResult back to open SigninActivity
<nb> public class DeterministicKey extends ECKey { COMMENT @ override public boolean hasPrivKey ( ) { - return findOrDerivePrivateKey ( ) != null ; + return findParentWithPrivKey ( ) != null ; } @ nullable <nb> public class DeterministicKey extends ECKey { return derivePrivateKeyDownwards ( cursor , parentalPrivateKeyBytes ) ; } - @ nullable - private BigInteger findOrDerivePrivateKey ( ) { + private DeterministicKey findParentWithPrivKey ( ) { DeterministicKey cursor = this ; while ( cursor != null ) { if ( cursor . priv != null ) break ; cursor = cursor . parent ; } + return cursor ; + } + + @ nullable + private BigInteger findOrDerivePrivateKey ( ) { + DeterministicKey cursor = findParentWithPrivKey ( ) ; if ( cursor == null ) return null ; return derivePrivateKeyDownwards ( cursor , cursor . priv . toByteArray ( ) ) ;
Don t derive private keys just to check if they exist
<nb> import NAMESPACE ; COMMENT COMMENT public interface Filter { + + Filter [ ] EMPTY_ARRAY = new Filter [ NUMBER0 ] ; + class Result { public final int highlightStartOffset ; public final int highlightEndOffset ;
Add Grails Console Filter only for Grails projects
<nb> package NAMESPACE ; COMMENT - COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT COMMENT public interface SharedService { - }
Improved JavaDoc of SharedService interface
<nb> import static NAMESPACE ; import static NAMESPACE ; import static NAMESPACE ; import static NAMESPACE ; - import static NAMESPACE ; import static NAMESPACE ; import static NAMESPACE ; import static NAMESPACE ; <nb> import NAMESPACE ; COMMENT COMMENT COMMENT + public class MessagingTransformers { static void registerTransformers ( final SubsystemRegistration subsystem ) { <nb> public class MessagingTransformers { SINGLE subsystemRoot . rejectChildResource ( JMSBridgeDefinition . PATH ) ; - SINGLE - subsystemRoot . rejectChildResource ( CoreAddressDefinition . PATH ) ; - subsystemRoot . rejectChildResource ( pathElement ( RUNTIME_QUEUE ) ) ; ResourceTransformationDescriptionBuilder hornetqServer = subsystemRoot . addChildResource ( pathElement ( HORNETQ_SERVER ) ) ; rejectAttributesWithExpression ( hornetqServer , HornetQServerResourceDefinition . ATTRIBUTES_WITH_EXPRESSION_ALLOWED_IN_1_2_0 ) ;
remove runtime resource from transformers
<nb> abstract class BoundedLocalCache < K , V > extends BLCHeader . DrainStatusRef < K , V > COMMENT void scheduleDrainBuffers ( ) { if ( evictionLock . tryLock ( ) ) { + if ( drainStatus ( ) == PROCESSING ) { + return ; + } try { lazySetDrainStatus ( PROCESSING ) ; executor ( ) . execute ( drainBuffersTask ) ; <nb> final class BLCHeader { } } + int drainStatus ( ) { + return UnsafeAccess . UNSAFE . getInt ( this , DRAIN_STATUS_OFFSET ) ; + } + void lazySetDrainStatus ( int drainStatus ) { UnsafeAccess . UNSAFE . putOrderedInt ( this , DRAIN_STATUS_OFFSET , drainStatus ) ; }
Avoid excessive scheduling of the maintenace task
<nb> public class BaseSetting extends Setting implements ConfigApplier < BaseSetting > { super ( matcher ) ; } - public boolean match ( HttpRequest request ) { + public boolean match ( Request request ) { return this . matcher . match ( request ) && this . handler != null ; }
applied request to base setting
<nb> public class ARSCDecoder { while ( type == Header . TYPE_TYPE ) { readTableType ( ) ; + + SINGLE + if ( mCountIn . getCount ( ) < mHeader . endPosition ) { + mCountIn . skip ( mHeader . endPosition - mCountIn . getCount ( ) ) ; + } + type = nextChunk ( ) . type ; addMissingResSpecs ( ) ;
Skip additional payload data of TYPE chunk
<nb> public class MvcEndpointCorsIntegrationTests { STRING0 ) ; createMockMvc ( ) . perform ( options ( STRING1 ) . header ( HttpHeaders . ORIGIN , STRING2 ) - . header ( HttpHeaders . ACCESS_CONTROL_REQUEST_METHOD , STRING3 ) ) + . header ( HttpHeaders . ACCESS_CONTROL_REQUEST_METHOD , STRING4 ) ) . andExpect ( status ( ) . isForbidden ( ) ) ; }
Switch disallowedMethods test to use PATCH
<nb> public class HttpClientHelper implements Closeable { } @ override - public void close ( ) throws IOException { + public synchronized void close ( ) throws IOException { if ( client != null ) { client . close ( ) ; }
Synchronize calls to close as well
<nb> public class PullUpProcessor extends BaseRefactoringProcessor implements PullUpD } private void processMethodsDuplicates ( ) { - if ( ! myTargetSuperClass . isValid ( ) ) return ; ProgressManager . getInstance ( ) . runProcessWithProgressSynchronously ( new Runnable ( ) { @ override public void run ( ) { ApplicationManager . getApplication ( ) . runReadAction ( new Runnable ( ) { @ override public void run ( ) { + if ( ! myTargetSuperClass . isValid ( ) ) return ; final Query < PsiClass > search = ClassInheritorsSearch . search ( myTargetSuperClass ) ; final Set < VirtualFile > hierarchyFiles = new HashSet < VirtualFile > ( ) ; for ( PsiClass aClass : search ) {
validity check under read action
<nb> public class HttpConfigurable implements PersistentStateComponent < HttpConfigurab } } } ; - WaitForProgressToShow . runOrInvokeAndWaitAboveProgress ( runnable , ModalityState . any ( ) ) ; + runAboveAll ( runnable ) ; return value [ NUMBER0 ] ; } <nb> public class HttpConfigurable implements PersistentStateComponent < HttpConfigurab } } } ; + runAboveAll ( runnable ) ; + return value [ NUMBER0 ] ; + } + + private void runAboveAll ( final Runnable runnable ) { final Runnable throughSwing = new Runnable ( ) { @ override public void run ( ) { <nb> public class HttpConfigurable implements PersistentStateComponent < HttpConfigurab } else { throughSwing . run ( ) ; } - return value [ NUMBER0 ] ; } SINGLE
for generic authentication also show authentication dialog above all possible dialogs
<nb> PropertyValue pv = ( PropertyValue ) itr . next ( ) ; System . out . println ( InvokerHelper . toString ( value ) ) ; } - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - public static void printf ( Object self , String format , Object [ ] values ) { - if ( System . getProperty ( STRING0 ) . charAt ( NUMBER0 ) == STRING1 ) { - System . out . printf ( format , values ) ; - } else { - throw new RuntimeException ( STRING2 ) ; - } - } - COMMENT COMMENT COMMENT
Reverted a change that should never have been committed
<nb> import NAMESPACE ; COMMENT COMMENT COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> import NAMESPACE ; COMMENT COMMENT COMMENT + COMMENT COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> import NAMESPACE ; COMMENT COMMENT COMMENT + COMMENT COMMENT COMMENT COMMENT
Fixing javadocs for StreamingTemplateEngine
<nb> public class JsrBasicRemote extends AbstractJsrRemote implements RemoteEndpoint . @ override public void sendText ( String text ) throws IOException { - LOG . info ( STRING0 , TextUtil . hint ( text ) ) ; assertMessageNotNull ( text ) ; if ( LOG . isDebugEnabled ( ) ) {
Removing JsrBasicRemote sendText info message
<nb> package NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; COMMENT COMMENT <nb> public abstract class ConnectionHandler extends IoHandlerAdapter { } SINGLE updateReadBytesCounter ( session ) ; + SINGLE SINGLE try { handler . process ( ( String ) message , parser ) ; <nb> public abstract class ConnectionHandler extends IoHandlerAdapter { super . messageSent ( session , message ) ; SINGLE updateWrittenBytesCounter ( session ) ; + SINGLE } abstract NIOConnection createNIOConnection ( IoSession session ) ;
Added printing of traffic commented out