Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View #38

Closed
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -38,10 +38,10 @@
import org.openjdk.jmc.common.item.IItemCollection;
import org.openjdk.jmc.common.util.FormatToolkit;
import org.openjdk.jmc.flightrecorder.stacktrace.FrameSeparator;
import org.openjdk.jmc.flightrecorder.stacktrace.Messages;
import org.openjdk.jmc.flightrecorder.stacktrace.StacktraceModel;
import org.openjdk.jmc.flightrecorder.stacktrace.StacktraceModel.Branch;
import org.openjdk.jmc.flightrecorder.stacktrace.StacktraceModel.Fork;
import org.openjdk.jmc.flightrecorder.stacktrace.messages.common.Messages;
import org.openjdk.jmc.flightrecorder.stacktrace.FrameSeparator.FrameCategorization;
import org.openjdk.jmc.flightrecorder.stacktrace.StacktraceFrame;

@@ -33,8 +33,8 @@
*/
package org.openjdk.jmc.flightrecorder.flameview.views;

import static org.openjdk.jmc.flightrecorder.stacktrace.messages.common.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME;
import static org.openjdk.jmc.flightrecorder.stacktrace.messages.common.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME_DESC;
import static org.openjdk.jmc.flightrecorder.stacktrace.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME;
import static org.openjdk.jmc.flightrecorder.stacktrace.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME_DESC;

import java.io.IOException;
import java.text.MessageFormat;
@@ -304,6 +304,6 @@ private static String fileContent(String fileName) {
}

private static String getStacktraceMessage(String key) {
return org.openjdk.jmc.flightrecorder.stacktrace.messages.common.Messages.getString(key);
return org.openjdk.jmc.flightrecorder.stacktrace.Messages.getString(key);
}
}
@@ -13,7 +13,6 @@ Export-Package: org.openjdk.jmc.flightrecorder,
org.openjdk.jmc.flightrecorder.parser,
org.openjdk.jmc.flightrecorder.parser.filter,
org.openjdk.jmc.flightrecorder.stacktrace,
org.openjdk.jmc.flightrecorder.stacktrace.messages.common,
org.openjdk.jmc.flightrecorder.stacktrace.messages.internal,
org.openjdk.jmc.flightrecorder.util
Require-Bundle: org.openjdk.jmc.common;visibility:=reexport
@@ -31,13 +31,13 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
* WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.openjdk.jmc.flightrecorder.stacktrace.messages.common;
package org.openjdk.jmc.flightrecorder.stacktrace;

import java.util.MissingResourceException;
import java.util.ResourceBundle;

public class Messages {
private static final String BUNDLE_NAME = "org.openjdk.jmc.flightrecorder.stacktrace.messages.common.messages"; //$NON-NLS-1$
private static final String BUNDLE_NAME = "org.openjdk.jmc.flightrecorder.stacktrace.messages"; //$NON-NLS-1$

private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);

@@ -34,7 +34,6 @@

import org.openjdk.jmc.common.IMCFrame;
import org.openjdk.jmc.common.util.FormatToolkit;
import org.openjdk.jmc.flightrecorder.stacktrace.messages.common.Messages;

/**
* Toolkit for presenting stack traces and stack frames in textual form.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.